Revert "2.3.6"

This reverts commit ea3481c322c666996a623fb0c3164fae08132eac.
Revert "Revert "2.3.6""

This reverts commit a8da5abaf82d4f3ec1f303365f51e680d30fef17.