Sync latest changes

This commit is contained in:
Internal Server Error - Git
500 Internal Server Error

Gitea Version: 1.28.0+dev-492-g1280de5704