Bugfix/4087

[derekellis]

My proposed fix for issue #4087

[etimberg]

I didn't see anything majorly wrong with the code. Looks like some tests were affected however, so that needs to be fixed before this can be merged

[benmccann]

@etimberg it looks like the tests have been fixed for this PR now

[simonbrunel]

Thanks @derekellis (would need to resolve conflicts before merge)

[benmccann]

@derekellis can you rebase this PR so that we can merge it?

[etimberg]

@derekellis are you still able to rebase this?

[benmccann]

@derekellis it looks like this PR is ready to be merged if you can rebase it

[benmccann]

@derekellis thanks for all the effort on this. we'd like to be able to merge, but may end up closing this PR if you aren't able to rebase it

[benmccann]

Closing this for now. Please feel free to reopen it once you've rebased it

[CWSites]

Since @derekellis has gone dark is this not something that ya'll or someone else could add into the codebase to fix the problem? I'm happy to submit a PR with a rebased version of the code changes above if that would work.