Merge branch 'release/2.1' into develop
Added null safe string conversion
Merge branch 'release/2.1.1'