CLOUD-289 consolidated gcc credential fields