Merge "Squish!" into jb-mr1-dev