Merge "Add tests to test KCM#combine and KCM#mapKey" into main