Merge branch 'patch/JAL-4116_slowtoopenstructure' into releases/Release_2_11_2_Branch