if someone wants to give me a shipit/lgtm on that, will land and cut a new 1.1.14 release with this and a couple other PRs that came in today