Merge branch 'hotfix/1.1.6'
Merge branch 'release/1.2.0'
Check setting type before json_decode
Merge branch 'hotfix/1.2.1' into develop