Merge changes from original repo