CLUB-218 #resolved