SA-CORE-2018-005 by MichaelCu, mwop, Wim Leers, bkosborne, cashwilliams, moshe weitzman, mlhess, xjm, larowlan, Jibran, DamienMcKenna (cherry picked from commit 776b7f39)