aofs-12 #321 (aofs-12)