Backport quick hotfix applied on master branch