[draft] chore(merge): 8.3.4 into merge/8.3.4

[draft] chore(merge): 8.3.4 into merge/8.3.4 #5549