aofs-11 #598 (aofs-11)