Big bug fixes
Merge branch 'release/1.1.4'