aofs-07 #579 (aofs-07)