Merge pull request #79 from brucehoff/SYNR-435

SYNR-435
SYNR-464
SYNR-464
SYNR-464
Merge pull request #80 from brucehoff/SYNR-464

SYNR-464