aofs-09 #630 (aofs-09)