- Split hotfix into own pull request