Merge back changes from official repo