Merge "Fix failing IT tests"