aofs-07 #511 (aofs-07)