Bump to v2.3.6
Merge branch 'release/2.3.6' into develop