Merge changes from cxd4 changes