HCOLL-199 Investigate why TC is missing tests
Merge remote-tracking branch 'origin/master'