fix jicmp6 version
Merge branch '1.12'
Merge branch 'master' into features/clustering