Merge pull request #19984 from jketema/jketema/sec-shared

Merge pull request #19984 from jketema/jketema/sec-shared #31664