Merge "code fixes for code coverage."