Merge "Update code coverage filtering"