GH-1 In order to clean up application java language level changes were applied
(cherry picked from commit a0948ec)