Merge branch 'jpred-fix' into bug/JAL-3807_jpred-with-slivka