WIP - DO NOT MERGE

Partial fix for acceptance test failures. Still needs more triaging.