This greatly improves discoverability of the feature and was made possible by dropping Java 7 support