CLUB-82 using same strategy as booking
Merge pull request #1046 from onepercentclub/feature/CLUB-82

CLUB-82 using same strategy as booking