Sync Java 6/7 and Java 8 versions
Merge commit '636a464b27877586f4cd6ef1e271b51d6b0c6ebb' into dev

Merge difference synchronization from @ams2990