Merge CM

Build proper camera client