Merge "Fixed problem with keymap files copied to target"