aofs-10 #531 (aofs-10)