moved disclaimer fixes #1291
Merge branch 'walport-water' into testing