2.3.6 Release - final public launch

Getting the Pull Request ready for the launch.