aofs-07 #621 (aofs-07)