Merge "add cleanspec." into jb-mr1-dev