Revert "Merge remote-tracking branch 'upstream/3.2.11'"
Description
I wanted to fix a merge conflict which was occurred during automatic sync with upstream. But I resolved it in a wrong way I think, It's still facing conflict during automatic sync with upstream. So, I want to revert this commit now.
Screenshots
Technical details
Tests
<Explain here the test scenarios that have been done for the feature, including corner cases.>
Issues
10 commandments of code reviews
<Keep the link above in the merge request description to remind the 10 commandments to the reviewers.>