CLUB-704 #resolve

Let's see if this moves the ticket
Merge pull request #1410 from onepercentclub/feature/club-704

CLUB-704 #resolve