aofs-07 #350 (aofs-07)