Merge "Fix test failures on treehugger?"