Merge branch 'hotfix/3.5.7'
3.6 release and documentation updates
Merge branch 'release/3.6'
Merge tag '3.6' into develop

Version 3.6