Merge branch 'rel/1.1.2' into develop
Make tests more individual
Merge branch 'develop'