Merge "DND ixD changes"