Revert "3.1 - 3.27"

This reverts commit a0dea7a2e260bc9224c0d6544aa5c582f0030e67.
Revert "Revert "3.1 - 3.27""

This reverts commit b0680066433b6db9974fcc2d5dbde55e0b7ab6f7.