am d49c9818: am c44c4742: Merge "Remove some hard-coded encoding parameters" into kraken