Bug 986551 admin cli rebase