Comment 2 for bug 1926621

screening: stx.6.0 / high; issue affects developer build environments. Unsure if the same change is needed for the r/stx.5.0 branch. If it is, please make sure to cherrypick the changes after they are merged in the main branch