aofs-12 #617 (aofs-12)