Update from original branch

Just a typical merge.