aofs-07 #452 (aofs-07)