The changes that I intended with this ticket are done.
I'm welcoming review of the development branch bug-9ba9729ef1.