Merge "BUG-1196, Bug 886: Refactored implementation of Choice Codec"