Merge branch 'D7' of origin into D7.