Merge branch 'bug/JAL-3065_DH_keyPair_Exception' into releases/Release_2_10_5_Branch