aofs-11 #372 (aofs-11)