Missing changes from upstream/master