[DOC-XXX][feature] - Restore Java 7 compatibility