Could some commiter please take a look at PR 48987 and 48988, I've had lots of requests for this and the patches are sitting in the PR database for almost a month now.