chore: merge branch 'main' into 'dev'

[medubelko]

Incorporate the hotfix from #496 and feature removal from #490.

[rkratky]

lgtm

[dwilding]

WDYT about setting up an action that checks that PRs into main must be from dev? It would be great to be able to configure this in branch protection rules for main, but I don't think that's possible. So an action would be the next best thing.

[medubelko]

WDYT about setting up an action that checks that PRs into main must be from dev? It would be great to be able to configure this in branch protection rules for main, but I don't think that's possible. So an action would be the next best thing.

It would be a useful check, but the larger need that drove the original change was the lack of a hotfix process. That's something for us to define in DOCPR-2389.

[dwilding]

It would be a useful check, but the larger need that drove the original change was the lack of a hotfix process. That's something for us to define in DOCPR-2389.

Got you, thanks. I won't work on it right now, but I'm happy to help as the discussion on DOCPR-2389 moves forward.

[tang-mm]

That's something for us to define in DOCPR-2389.

Thanks for syncing them! Also adding my two cents:
If we want contributors to target the dev branch by default, it's best to update the repository's default branch to dev in the repo settings rather than relying on documentation or internal guidelines.
That said, if there’s a reason to keep main as the default branch (e.g. for releases or CI), then we should expect that contributors will naturally target main in new PRs, and our workflow should be adapted to handle this accordingly.
Without enforced setup and clear instructions, we'll face ongoing maintenance overhead with PRs like this one to sync