This one has been partially implemented for regular builds
but making it generally available seems much better.