Update message flow for shim-layer architecture

No match.