Added buggfix 1
Added buggfix 2
Merge branch 'release-1.4' into develop