aofs-10 #334 (aofs-10)