[feature/CLUB-588] merge fix
[feature/CLUB-588] typo fix
[feature/CLUB-588] merge fix
Merge pull request #1408 from onepercentclub/feature/CLUB-588

Feature/club 588