Merge "Bug 1869: Fixed binding-data-codec to work with empty type"