aofs-07 #480 (aofs-07)