aofs-11 #339 (aofs-11)