Merge branch 'irrigation' into develop (PR #138)