aofs-07 #370 (aofs-07)