aofs-11 #640 (aofs-11)