Merge "Merge DAX2 changes"