Finishing 1.3.14 hotfix branch