Merge "BUG-472: fix integration test breakage"