Just a bump, as the issue is still there in 3.8.1, and the fix still works without introducing issues as far as I can tell