Merge branch 'JAL-4152-typed-singleton-provider' into mmw/Release_2_12_ws_merge