aofs-10 #621 (aofs-10)