aofs-07 #326 (aofs-07)