Merge "Split Shim-layer architecture and Integrated architecture"