Merge branch 'dri2'