Merge branch 'hotfix/release-3.1'
Fixed social networking display region
Merge branch 'hotfix/release-3.2' into develop