Merge pull request #1910 from arik-so/2022-12-keys-interface-name-split