Merge branch 'patch/JAL-2197_jpredforjnets' into develop