Watersmart 109 - (branched off of WATERSMART-117)

I feature branched off of a feature branch, so it will be easier to review this pull request if you wait until the pull request for WATERSMART-117 is accepted before reviewing this one.