aofs-10 #513 (aofs-10)