Merge upstream/harmony

Running through tests now to make sure this doesn't break anything internally, but was an almost perfectly clean merge.