Merge remote-tracking branch 'origin/PY-9727' into PY-9727