have done all but this for master in #1022 .  this would be good to do!