Merge "Remove the hard-coded counterId in VaultParams" into pi-dev