Sounds like this should be resolved before this PR is merged.