aofs-11 #326 (aofs-11)