Merge branch 'patch/Release_2_11_2_6_Branch' into develop