aofs-12 #561 (aofs-12)