SYNR-329
Merge branch 'SYNR-329' into develop
SYNR-329 follow up to code review
Merge pull request #65 from brucehoff/develop

SYNR-329