aofs-11 #417 (aofs-11)