fixes before smoke testing
Merge branch 'testing' into diffbot-testing