aofs-08 #617 (aofs-08)