Merge branch 'd2'