Merge "Run with scissors." into jb-mr1-dev