Merge "Multiple fixes to CMAS app." into jb-mr1-dev