aofs-12 #638 (aofs-12)