Merge pull request #1118 from onepercentclub/feature/CLUB-1029

Feature/club 1029