aofs-08 #561 (aofs-08)