aofs-11 #630 (aofs-11)