CLUB-704 #resolve

Let's see if this moves the ticket