Stop clop runs, track clop output
Merge remote-tracking branch 'origin/master'