Manually adding hotfix 2.3.21