@Bob Church, please cherrypick the changes to the r/stx.3.0 branch for inclusion in the first maintenance release.
@Bob Church, please cherrypick the changes to the r/stx.3.0 branch for inclusion in the first maintenance release.