PRD-4625: Test and fix
Merge pull request #170 from tmorgner/PRD-4625

PRD-4625: Test and fix