Merge "self-serve DG for Casablanca"