First merges of original repo