Merge branch 'JAL-3878_ws-overhaul-3' into mmw/Release_2_12_ws_merge