Just leaving this as a tracker, currently working on it in #649 as well, while writing additional tests and testing facilities for that PR.
