Merge changes I77671bd4,I22021266 into rvc-dev

* changes:
  Controls UI - Structure switching
  Controls - Structure persistence