Dmap merge

Merge develop into DMap.