Hotfix to tag 2.7.2