Update to latest CH and add vault_pgroup