aofs-10 #390 (aofs-10)