Kiyo branch

Bringing all branches up to date.