cherry pick router diagram from master to 1.5-branch