This is actually already done in the 6.0 work. I personally have no plans to backport that, but porting it should not be too difficult.