aofs-07 #484 (aofs-07)