Merge branch 'master' into develop
Fixed: error when disclaimer is set to null
Merge branch 'develop'