Merge "codecoverage improvement"