aofs-07 #466 (aofs-07)