SI-6169 TODO: consolidate with fix for SI-1786 (#2518)
Merge pull request #3496 from adriaanm/t6169

SI-6169 TODO: consolidate with fix for SI-1786 (#2518)