aofs-12 #632 (aofs-12)