Merge pull request #57 from brucehoff/develop

SYNR-358
SYNR-410; SYNR-408
SYNR-358
Merge branch 'SYNR-358' into develop