Merged Daanvc branch.