Update to a newer snapshot 9.0.d20190510.

I used the submitted patch for inspiration, but regenerated most of it
and added some unrelated cleanups.

PR: 237819
Requested by: yuri
Submitted by: yuri