Merged changes from upstream/master