Comment 7 for bug 2017592

@Lucas, Based on the community call, we believe the same change will be needed for the release branches: r/stx.6.0, r/stx.7.0, r/stx.8.0. Please inspect the source code for these branches and update if applicable.