Merge branch 'CLR-3.5'