@ehmry: please have a look so that we can cherry-pick in release-16.09 and move forward on #18209
Communication happens on Github so names should be consistent.