MR !165922 (merged) needed to be reverted due to a regression. This issue is to re-introduce said feature