upgrading codebase to 2.3.6