Persist controller to single feed
Merge branch 'hotfix-vote-on-single' into development

* hotfix-vote-on-single:
  Persist controller to single feed