v5.2.4-20220804
62e3cea7 · [hotfix]: cherry-pick 33946, 34538 and 35367 to v5.2.4 (#36898) ·