aofs-07 #469 (aofs-07)