On 10/22/20 11:20 AM, Tom de Vries wrote:

Rebased on current master, committed as attached below.

Thanks,
- Tom