Merge "Fix ss-generate-name DG"