Allow regex to match https URIs

[#62122500]
Line up comments

[#62122500]
Whitespace fixup

[#62122500]
Merge branch 'master' into staging
Merge branch 'staging' into stable