Merge "Copy all mutable state before sending to clients." into jb-mr1-dev