Created attachment 14065 [details] patch for master
Pushed patch to master. I'll cherry-pick for 4.8.next, 4.7.next once it lands.