Merge branch 'rj/highlight-test-hang'