aofs-07 #504 (aofs-07)