Merge branch 'hotfix/1.0b1.1.1'
Merge branch 'release/1.0b1.2'
Merge branch 'release/1.0b1.3'
added tests.patches missed from previous commit (all tests will fail without it but codebase is fine)
Merge branch 'hotfix/1.0b1.3.1' into develop