aofs-09 #579 (aofs-09)