Merge r1643825 from trunk: * core: Fix -D[efined] or <Define>[d] variables lifetime accross restarts. PR 57328. Submitted-by: Armin Abfalterer <a.abfalterer gmail.com> Reviewed/Committed-by: ylavic Submitted by: ylavic Reviewed/backported by: jim