SA-CORE-2023-001 by danflanagan8, larowlan, xjm, seanB, Berdir, benjifisher, longwave, jenlampton, lauriii (cherry picked from commit 147e3d5bb3d74cbe32c6498f792265f8f71406eb)