aofs-12 #598 (aofs-12)