Merge "improve method coverate analysis of CTS" into jb-mr1-dev