aofs-10 #624 (aofs-10)