This MR is created only for testing 3.11.3 release before deployment.
3.11.3
The last 4 branches expected to be included in 3.11.3 are included and merged into this test branch.