aofs-11 #336 (aofs-11)