CLUB-703 #resolve