[EGD-5737] Merge master into experimental

Keep experimental up to date with changes from master
This commit is contained in:
Internal Server Error - Gitea: Git with a cup of tea
500 Internal Server Error

Gitea Version: 1.28.0+dev-477-g8b6ad49a5f