aofs-10 #580 (aofs-10)