CLUB-820, #resolved
Merge pull request #1080 from onepercentclub/fixture/CLUB-820

CLUB-820, #resolved