Merge branch 'master' into develop
Fix error when saving nil value
version up to 2.2.1
Merge branch 'release/2.2.1'