[DOC-XXX][feature] - Restore Java 7 compatibility
Merge pull request #852 from rsvato/master

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