Merge "Fix issues shown on CTS tests" into jb-mr1-dev