Merged Updates from Kino and Herbert