Merge branch 'patch/JAL-2197_jpredforjnets' into releases/Release_2_10_Branch