aofs-07 #622 (aofs-07)