Comment 37 for bug 1821026

Fixes are merged in stx master and will be included in the stx.4.0 release. Given no users have raised an issue with this when using stx.3.0, the plan is not to port back the changes due to complexity.