Merge branch 'features/JAL-1565_jpred4' into Release_2_8_3_Branch