PR 1706 followups
Merge pull request #1732 from waterlink/1706_followups

PR 1706 followups