Merge changes from zats