Merge "Added more upstream work"