Updated "Manager" branch against upstream master

Note that this pull request includes the rebased changes from the "manager" branch (which can be deleted now).