Merge branch 'encode' into future