Merge branch 'hotfix/3.5.8' into production
Merge branch 'release/3.6.0' into production
facebook
Merge branch 'hotfix/facebook'