Andrea Boriero started to work on a PR but we decided it's too risky to get included into 5.3 at this point. There are quite a lot of open questions about this issue so let's target 5.4 and revisit it later.