Comment 10 for bug 1956229

Based on the community discussion today, it would be nice to fix this issue for stx.6.0 to reach a green sanity. We'd need a fix by early next week (Jan 17-18) to avoid impacting the release declaration plans (target: Jan 21).