Re-apply set key changes: revert of revert commit#461

Andriciuc merged 1 commit intorelease-17.5.2percona/postgres:release-17.5.2from

revert-the-revertpercona/postgres:revert-the-revertCopy head branch name to clipboard