Switching work
Merge branch 'master' into t2

Resync with master.
Ui and debugging improvements.
Merge pull request #439 from karma-exchange-org/ui-improvements-partner-integ

Ui improvements partner integ