First commit on branch
Add Citizen CMP-30 support