Rebasing physical machine manager onto feature/physical-sandboxes.