Merge branch 'release-1.4'
Added hotfix 1
Merge branch 'hotfix-1.4.1' into develop