aofs-11 #473 (aofs-11)