aofs-11 #520 (aofs-11)