Preparing release 2.3.6
Back to development: 2.3.7