Comment 32 for bug 1830142

As per discussion with Frank, we agreed to re-gate this to stx.3.0 and not have the changes cherry-picked to the stx.2.0 release branch due to the large # of commits related to this LP.