Create a merge request for ubiqus branch.

This branch was to test ubiqus switches. We concluded that the controller has no identifiable problems. Thus, we merge this branch to the master.