Merge branch 'master' into decode-experiment
don't decode images
Merge branch 'decode-experiment'