CLUB-673 #Resolved