Support Java 8 compatibility [ticket #8541] First Release