aofs-07 #580 (aofs-07)