Merge branch 'JAL-3878_ws-overhaul-3' into with_ws_overhaul-3