Prepare 2.3.6 release