Created attachment 209312 [details] Patch v1 The previous attempt worked in simple cases, but failed in more complex ones. A new approach is needed.
A precursor to this patch will be rolling out the previous attempt from r153637.
This was landed back in r154538.