aofs-08 #622 (aofs-08)