ref #4123 - merge prd and gid stuff