Not needed per review.
Merge pull request #153 from xschildw/develop

Not needed per review.
Merge pull request #152 from brucehoff/develop

SYNR-680
SYNR-732