SA-CORE-2021-001 by larowlan, stephenacrossri, siliconmeadow, mcdruid, xjm, vijaycs85, mlhess, greggles
Closes #3255068