Finishing 1.4.6 hotfix branch