aofs-10 #521 (aofs-10)