aofs-08 #580 (aofs-08)