Merge branch 'hotfix/stdClass'
Merge branch 'master' into develop