Merge changes for xah