Merge pull request #146 from brucehoff/develop

SYNR-679
SYNR-707
Merge pull request #148 from brucehoff/SYNR-707

SYNR-707
SYNR-680