Cherry pick from 400675ea9b: *CURRENT* rmt:get-keys now working