Merge pull request #1930 from arik-so/2022-12-remove-keysinterface