Merge branch 'patch/JAL-3750_JAL-3741_https_patch' into releases/Release_2_11_1_Branch