Merge "self serve DG bugfix" into frankfurt