Merge pull request #157 from brucehoff/SYNR-736

Synr 736
SYNR-670
SYNR-670
SYNR-670
SYNR-670
SYNR-670
SYNR-670
SYNR-670
SYNR-670
SYNR-670
SYNR-670
SYNR-670
SYNR-670
SYNR-670
SYNR-670
SYNR-670
SYNR-670
SYNR-670
SYNR-670
SYNR-670