Merge "Eat copy pasta." into jb-mr1-dev