aofs-11 #622 (aofs-11)