OK. I think that this PR is good to go, but I do have to jump in a plane.

Could another core dev please review and merge.