PR 7565 fixed

Still have some internal tests failing - investigating. This PR is just to make it easier to review.