Merge "Add Caps-Shift to lowercase letter mapping"