Merge "Yet more debugging for 10858941." into klp-dev