Finishing 1.4.1 hotfix branch