aofs-10 #622 (aofs-10)