Merge pull request #154 from brucehoff/SYNR-736

Synr 736
SYNR-732
Merge pull request #155 from brucehoff/develop

Develop
Merge branch 'develop' into SYNR-736