Prepare release 2.3.6