josephevans Port top-level-project updates from v1.x branch (#21162)