Merge "Ensure that the decoder is thread-safe." into jb-mr1-dev