More review on PR 2081
Merge pull request #1 from raoulb/pr2081_review

More review on PR 2081: Merged in to PR #2081