DCR changes
merge conflict
Fixes after merge to latest code.