Merge branch 'clscan'