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