aofs-11 #632 (aofs-11)