Merge "QueryCodecs() signature change"