aofs-10 #331 (aofs-10)