I've included this one in larger scope PR #253
Closing in favor of #253, which includes this
Pull-Request has been closed by mikem