Rebase onto Kube 0.7.0

* Disabled upstream UIs
* Minor fixups

[test]