Merge branch 'js/cvs'