Full commit following Github sync.