Merge back 'chore_release-pd-8.6.3' into 'chore_release-8.8.0'

Merge back 'chore_release-pd-8.6.3' into 'chore_release-8.8.0' #20857