This fix fixes everything!

Merge branch 'hotfix/v1.1'
added another fix
Merge another fix also in develop

Merge branch 'hotfix/anotherFix' into develop