Merge branch 'release/2.1.0' into develop
Fix asserts
Merge branch 'develop'