aofs-07 #561 (aofs-07)