This has reached a testable level; observe that the PR goes to upstream/research