backmerge hotfix