Merge branch 'svost-cl-ver'