aofs-12 #637 (aofs-12)