Merge "Bug 1260: Implemented Binding Caching Codec"