aofs-10 #561 (aofs-10)