Merge commit for cherry-pick release 2.54.1