aofs-10 #630 (aofs-10)