aofs-12 #630 (aofs-12)