Merge branch 'portforward/JAL-3765_patch_to_2112' into develop