aofs-10 #372 (aofs-10)