- fix crash on macro which undefines itself - fix script dependency generation with file 5.07 string changes (#712251)