Merge "Remove some hard-coded encoding parameters" into kraken