Merge 3.5.3 release head with main 3.5 branch.