@trek @rjackson Done. Let me know if there's anything else I could do to have that PR merged.