SYNR-410; SYNR-408
SYNR-358
Merge branch 'SYNR-358' into develop
Merge pull request #58 from brucehoff/develop

SYNR-408, SYNR-410, SYNR-358