Merge changes from upstream after weekend