PR cleanup
Merge branch 'feature/load-voter-info' into develop
Merge develop into feature/load-voter-info-2
Cleanup for PR