aofs-07 #602 (aofs-07)