Changes to merge into hotfix