SYNR-833
Merge pull request #183 from brucehoff/SYNR-833

SYNR-833
Merge pull request #182 from brucehoff/SYNR-822

Synr 822
SYNR-846