Upgrade to CM4. Reformat code.
Merge with master - upgrade to CM4