Bugfixes
Merge branch 'release/1.1.3' into develop