I was missing this feature and implemented it, not knowing that there was #944 already ¯\_(ツ)_/¯ Looking at it now I think that my impl is a little better, and I'd love to have it upstreamed. Closes #820 and #944