@Jim Gauld, please cherrypick the additional commit to the r/stx.3.0 branch for inclusion in the first maintenance release.
@Jim Gauld, please cherrypick the additional commit to the r/stx.3.0 branch for inclusion in the first maintenance release.