Merge branch 'main' into tylerjdev/no-focus-if-hidden

Merge branch 'main' into tylerjdev/no-focus-if-hidden #98