SYNR-832
Merge pull request #187 from brucehoff/SYNR-832

Synr 832
SYNR-828
SYNR-818