am 4919d556: Merge change 2135 into donut

Merge commit '4919d556f5473e9b2b6db2b057f0a88d627fb77f'

* commit '4919d556f5473e9b2b6db2b057f0a88d627fb77f':
  nexus: Switch controllers to use abstracted properties and refactor command protocol