Just commented on the PR! I think it's not worth backporting this PR anymore. It's not critical. The master PR landed already and it will be part of 2.5, which is good enough.