Code for this is in rt46404. I'm not putting it in for review yet but will
finish the work (release note, test, etc) after we branch 9.13.