Merge branch 'feature/JAL-2994chimeraPath' into releases/Release_2_10_4_Branch