Merge pull request #61 from brucehoff/develop

SYNR-358
SYNR-327
Merge branch 'SYNR-404' into develop