Merge back release-v1.54.0 into main (#4300)