Merge "Fix encoder crashes and enc/dec mismatches"