Merge in recent dev changes from upstream