Creating Exposure for Shim 2006 at commit a3421a758163bc7c64013c6b2d526fdbaadcf8a6