I'm going to push the attached very soon, to address this.

thanks,
Pádraig.