aofs-09 #580 (aofs-09)