Merge branch 'release/2.3.6'
Merge branch 'master' into develop