pre merge commit
Use right basis for dc comparison
Pre merge commit
Merge