Pr headless support

Unfortunately, while cherrypick made it easy to merge the changes into develop, it also made it difficult to push the changes under the old PR.  No doubt something lacking in my git application.