Merge with CM

Signed-off-by: Paul Keith <javelinanddart@gmail.com>