aofs-12 #336 (aofs-12)