aofs-12 #640 (aofs-12)