Merge branch 'handle-end-string-decoder'