Hi,
Since v1 no longer applied cleanly due to a conflict, I rebased it onto current master at fcc0e27f45e. Attached is v2.
Regards,Chee Wooson