This will allow privacy management to use existing code. Some template updates also are for rationalising how groups are created and edited.