aofs-12 #326 (aofs-12)