Merge remote-tracking branch 'origin/liana/PY-20932'