Merge "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS"