aofs-11 #344 (aofs-11)