aofs-11 #504 (aofs-11)