aofs-12 #332 (aofs-12)