aofs-10 #537 (aofs-10)