Merge "Fix KCM key mapping cloning" into rvc-dev