PDI-9647 - Revisions based on Carter's testing
Merge pull request #18 from brosander/PDI-9647-forward-port

PDI-9647 - Revisions based on Carter's testing