Merge master branch into main branch

[ajhool]

Hello!

• Vote on this issue by adding a 👍 reaction
• If you want to implement this feature, comment to let us know (we'll work with you on design, scheduling, etc.)

Issue details

"master" branch was created by local git cli, change to "main" to conform to GitHub's main branch

Affected area/feature