Merge branch 'master' into releases/Release_2_11_2_Branch