Merge "self serve DG bugfix"