aofs-11 #521 (aofs-11)