Unique suffixes (#4658) - Basecamp