Merge remote-tracking branch 'origin/fitermay/PY-20771'