some progress on accelerated vesting
Merge branch 'walport-water' into testing