aofs-07 #297 (aofs-07)