aofs-10 #617 (aofs-10)