Merge remote-tracking branch 'origin/pr-18308' into pr-18308