Merge branch 'mmw/Release_2_12_ws_merge' into development/Release_2_12_Branch