Merge branch 'development/Release_2_12_Branch' into mmw/Release_2_12_ws_merge