feature/CLUB-578