Merge "Fix for overlay DGs."