copy change fixes #1289
Merge branch 'walport-water' into testing