aofs-11 #498 (aofs-11)