aofs-10 #632 (aofs-10)