Merge main into develop after the 0.11.1 release - #1041

Merge main into develop after the 0.11.1 release#1041

GaryJones merged 4 commits into

developAutomattic/edit-flow:developfrom

mainAutomattic/edit-flow:mainCopy head branch name to clipboard