Merge back 0.64, 0.65, 0.66 and 0.67 patches in main branch
What does this MR do?
It handles merge conflicts and merges back 0.64, 0.65, 0.66 and 0.67 patches in main branch.
Why was this MR needed?
To make sure that the changelog is not altered in any way
What's the best way to test this MR?
NA