Merge branch 'patch/JAL-2754_patch2104forJava8' into releases/Release_2_10_4_Branch