diff --git a/plugins/org.eclipse.embedcdt.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.embedcdt.core/META-INF/MANIFEST.MF
index 53c6ab179..7508217d9 100644
--- a/plugins/org.eclipse.embedcdt.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.embedcdt.core/META-INF/MANIFEST.MF
@@ -9,12 +9,306 @@ Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %bundle.vendor
 Bundle-Localization: plugin
 Export-Package: org.eclipse.embedcdt.core,
- org.eclipse.embedcdt.core.liqp,
- org.eclipse.embedcdt.core.liqp.exceptions,
- org.eclipse.embedcdt.core.liqp.filters,
- org.eclipse.embedcdt.core.liqp.nodes,
- org.eclipse.embedcdt.core.liqp.parser,
- org.eclipse.embedcdt.core.liqp.tags,
+ org.eclipse.embedcdt.core.liqp;
+  x-friends:="org.eclipse.embedcdt,
+   org.eclipse.embedcdt.codered,
+   org.eclipse.embedcdt.codered.ui,
+   org.eclipse.embedcdt.core,
+   org.eclipse.embedcdt.debug.core,
+   org.eclipse.embedcdt.debug.gdbjtag,
+   org.eclipse.embedcdt.debug.gdbjtag.core,
+   org.eclipse.embedcdt.debug.gdbjtag.jlink,
+   org.eclipse.embedcdt.debug.gdbjtag.jlink.core,
+   org.eclipse.embedcdt.debug.gdbjtag.jlink.ui,
+   org.eclipse.embedcdt.debug.gdbjtag.openocd,
+   org.eclipse.embedcdt.debug.gdbjtag.openocd.core,
+   org.eclipse.embedcdt.debug.gdbjtag.openocd.ui,
+   org.eclipse.embedcdt.debug.gdbjtag.pyocd,
+   org.eclipse.embedcdt.debug.gdbjtag.pyocd.core,
+   org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui,
+   org.eclipse.embedcdt.debug.gdbjtag.qemu,
+   org.eclipse.embedcdt.debug.gdbjtag.qemu.core,
+   org.eclipse.embedcdt.debug.gdbjtag.qemu.ui,
+   org.eclipse.embedcdt.debug.gdbjtag.restart.ui,
+   org.eclipse.embedcdt.debug.gdbjtag.ui,
+   org.eclipse.embedcdt.debug.packs,
+   org.eclipse.embedcdt.doc.user,
+   org.eclipse.embedcdt.managedbuild.cross,
+   org.eclipse.embedcdt.managedbuild.cross.arm,
+   org.eclipse.embedcdt.managedbuild.cross.arm.core,
+   org.eclipse.embedcdt.managedbuild.cross.arm.ui,
+   org.eclipse.embedcdt.managedbuild.cross.core,
+   org.eclipse.embedcdt.managedbuild.cross.riscv,
+   org.eclipse.embedcdt.managedbuild.cross.riscv.core,
+   org.eclipse.embedcdt.managedbuild.cross.riscv.ui,
+   org.eclipse.embedcdt.managedbuild.cross.ui,
+   org.eclipse.embedcdt.managedbuild.packs.ui,
+   org.eclipse.embedcdt.packs,
+   org.eclipse.embedcdt.packs.core,
+   org.eclipse.embedcdt.packs.ui,
+   org.eclipse.embedcdt.templates.ad,
+   org.eclipse.embedcdt.templates.ad.ui,
+   org.eclipse.embedcdt.templates.core,
+   org.eclipse.embedcdt.templates.cortexm,
+   org.eclipse.embedcdt.templates.cortexm.ui,
+   org.eclipse.embedcdt.templates.freescale,
+   org.eclipse.embedcdt.templates.freescale.pe.ui,
+   org.eclipse.embedcdt.templates.freescale.ui,
+   org.eclipse.embedcdt.templates.sifive,
+   org.eclipse.embedcdt.templates.sifive.ui,
+   org.eclipse.embedcdt.templates.stm,
+   org.eclipse.embedcdt.templates.stm.ui,
+   org.eclipse.embedcdt.ui",
+ org.eclipse.embedcdt.core.liqp.exceptions;
+  x-friends:="org.eclipse.embedcdt,
+   org.eclipse.embedcdt.codered,
+   org.eclipse.embedcdt.codered.ui,
+   org.eclipse.embedcdt.core,
+   org.eclipse.embedcdt.debug.core,
+   org.eclipse.embedcdt.debug.gdbjtag,
+   org.eclipse.embedcdt.debug.gdbjtag.core,
+   org.eclipse.embedcdt.debug.gdbjtag.jlink,
+   org.eclipse.embedcdt.debug.gdbjtag.jlink.core,
+   org.eclipse.embedcdt.debug.gdbjtag.jlink.ui,
+   org.eclipse.embedcdt.debug.gdbjtag.openocd,
+   org.eclipse.embedcdt.debug.gdbjtag.openocd.core,
+   org.eclipse.embedcdt.debug.gdbjtag.openocd.ui,
+   org.eclipse.embedcdt.debug.gdbjtag.pyocd,
+   org.eclipse.embedcdt.debug.gdbjtag.pyocd.core,
+   org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui,
+   org.eclipse.embedcdt.debug.gdbjtag.qemu,
+   org.eclipse.embedcdt.debug.gdbjtag.qemu.core,
+   org.eclipse.embedcdt.debug.gdbjtag.qemu.ui,
+   org.eclipse.embedcdt.debug.gdbjtag.restart.ui,
+   org.eclipse.embedcdt.debug.gdbjtag.ui,
+   org.eclipse.embedcdt.debug.packs,
+   org.eclipse.embedcdt.doc.user,
+   org.eclipse.embedcdt.managedbuild.cross,
+   org.eclipse.embedcdt.managedbuild.cross.arm,
+   org.eclipse.embedcdt.managedbuild.cross.arm.core,
+   org.eclipse.embedcdt.managedbuild.cross.arm.ui,
+   org.eclipse.embedcdt.managedbuild.cross.core,
+   org.eclipse.embedcdt.managedbuild.cross.riscv,
+   org.eclipse.embedcdt.managedbuild.cross.riscv.core,
+   org.eclipse.embedcdt.managedbuild.cross.riscv.ui,
+   org.eclipse.embedcdt.managedbuild.cross.ui,
+   org.eclipse.embedcdt.managedbuild.packs.ui,
+   org.eclipse.embedcdt.packs,
+   org.eclipse.embedcdt.packs.core,
+   org.eclipse.embedcdt.packs.ui,
+   org.eclipse.embedcdt.templates.ad,
+   org.eclipse.embedcdt.templates.ad.ui,
+   org.eclipse.embedcdt.templates.core,
+   org.eclipse.embedcdt.templates.cortexm,
+   org.eclipse.embedcdt.templates.cortexm.ui,
+   org.eclipse.embedcdt.templates.freescale,
+   org.eclipse.embedcdt.templates.freescale.pe.ui,
+   org.eclipse.embedcdt.templates.freescale.ui,
+   org.eclipse.embedcdt.templates.sifive,
+   org.eclipse.embedcdt.templates.sifive.ui,
+   org.eclipse.embedcdt.templates.stm,
+   org.eclipse.embedcdt.templates.stm.ui,
+   org.eclipse.embedcdt.ui",
+ org.eclipse.embedcdt.core.liqp.filters;
+  x-friends:="org.eclipse.embedcdt,
+   org.eclipse.embedcdt.codered,
+   org.eclipse.embedcdt.codered.ui,
+   org.eclipse.embedcdt.core,
+   org.eclipse.embedcdt.debug.core,
+   org.eclipse.embedcdt.debug.gdbjtag,
+   org.eclipse.embedcdt.debug.gdbjtag.core,
+   org.eclipse.embedcdt.debug.gdbjtag.jlink,
+   org.eclipse.embedcdt.debug.gdbjtag.jlink.core,
+   org.eclipse.embedcdt.debug.gdbjtag.jlink.ui,
+   org.eclipse.embedcdt.debug.gdbjtag.openocd,
+   org.eclipse.embedcdt.debug.gdbjtag.openocd.core,
+   org.eclipse.embedcdt.debug.gdbjtag.openocd.ui,
+   org.eclipse.embedcdt.debug.gdbjtag.pyocd,
+   org.eclipse.embedcdt.debug.gdbjtag.pyocd.core,
+   org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui,
+   org.eclipse.embedcdt.debug.gdbjtag.qemu,
+   org.eclipse.embedcdt.debug.gdbjtag.qemu.core,
+   org.eclipse.embedcdt.debug.gdbjtag.qemu.ui,
+   org.eclipse.embedcdt.debug.gdbjtag.restart.ui,
+   org.eclipse.embedcdt.debug.gdbjtag.ui,
+   org.eclipse.embedcdt.debug.packs,
+   org.eclipse.embedcdt.doc.user,
+   org.eclipse.embedcdt.managedbuild.cross,
+   org.eclipse.embedcdt.managedbuild.cross.arm,
+   org.eclipse.embedcdt.managedbuild.cross.arm.core,
+   org.eclipse.embedcdt.managedbuild.cross.arm.ui,
+   org.eclipse.embedcdt.managedbuild.cross.core,
+   org.eclipse.embedcdt.managedbuild.cross.riscv,
+   org.eclipse.embedcdt.managedbuild.cross.riscv.core,
+   org.eclipse.embedcdt.managedbuild.cross.riscv.ui,
+   org.eclipse.embedcdt.managedbuild.cross.ui,
+   org.eclipse.embedcdt.managedbuild.packs.ui,
+   org.eclipse.embedcdt.packs,
+   org.eclipse.embedcdt.packs.core,
+   org.eclipse.embedcdt.packs.ui,
+   org.eclipse.embedcdt.templates.ad,
+   org.eclipse.embedcdt.templates.ad.ui,
+   org.eclipse.embedcdt.templates.core,
+   org.eclipse.embedcdt.templates.cortexm,
+   org.eclipse.embedcdt.templates.cortexm.ui,
+   org.eclipse.embedcdt.templates.freescale,
+   org.eclipse.embedcdt.templates.freescale.pe.ui,
+   org.eclipse.embedcdt.templates.freescale.ui,
+   org.eclipse.embedcdt.templates.sifive,
+   org.eclipse.embedcdt.templates.sifive.ui,
+   org.eclipse.embedcdt.templates.stm,
+   org.eclipse.embedcdt.templates.stm.ui,
+   org.eclipse.embedcdt.ui",
+ org.eclipse.embedcdt.core.liqp.nodes;
+  x-friends:="org.eclipse.embedcdt,
+   org.eclipse.embedcdt.codered,
+   org.eclipse.embedcdt.codered.ui,
+   org.eclipse.embedcdt.core,
+   org.eclipse.embedcdt.debug.core,
+   org.eclipse.embedcdt.debug.gdbjtag,
+   org.eclipse.embedcdt.debug.gdbjtag.core,
+   org.eclipse.embedcdt.debug.gdbjtag.jlink,
+   org.eclipse.embedcdt.debug.gdbjtag.jlink.core,
+   org.eclipse.embedcdt.debug.gdbjtag.jlink.ui,
+   org.eclipse.embedcdt.debug.gdbjtag.openocd,
+   org.eclipse.embedcdt.debug.gdbjtag.openocd.core,
+   org.eclipse.embedcdt.debug.gdbjtag.openocd.ui,
+   org.eclipse.embedcdt.debug.gdbjtag.pyocd,
+   org.eclipse.embedcdt.debug.gdbjtag.pyocd.core,
+   org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui,
+   org.eclipse.embedcdt.debug.gdbjtag.qemu,
+   org.eclipse.embedcdt.debug.gdbjtag.qemu.core,
+   org.eclipse.embedcdt.debug.gdbjtag.qemu.ui,
+   org.eclipse.embedcdt.debug.gdbjtag.restart.ui,
+   org.eclipse.embedcdt.debug.gdbjtag.ui,
+   org.eclipse.embedcdt.debug.packs,
+   org.eclipse.embedcdt.doc.user,
+   org.eclipse.embedcdt.managedbuild.cross,
+   org.eclipse.embedcdt.managedbuild.cross.arm,
+   org.eclipse.embedcdt.managedbuild.cross.arm.core,
+   org.eclipse.embedcdt.managedbuild.cross.arm.ui,
+   org.eclipse.embedcdt.managedbuild.cross.core,
+   org.eclipse.embedcdt.managedbuild.cross.riscv,
+   org.eclipse.embedcdt.managedbuild.cross.riscv.core,
+   org.eclipse.embedcdt.managedbuild.cross.riscv.ui,
+   org.eclipse.embedcdt.managedbuild.cross.ui,
+   org.eclipse.embedcdt.managedbuild.packs.ui,
+   org.eclipse.embedcdt.packs,
+   org.eclipse.embedcdt.packs.core,
+   org.eclipse.embedcdt.packs.ui,
+   org.eclipse.embedcdt.templates.ad,
+   org.eclipse.embedcdt.templates.ad.ui,
+   org.eclipse.embedcdt.templates.core,
+   org.eclipse.embedcdt.templates.cortexm,
+   org.eclipse.embedcdt.templates.cortexm.ui,
+   org.eclipse.embedcdt.templates.freescale,
+   org.eclipse.embedcdt.templates.freescale.pe.ui,
+   org.eclipse.embedcdt.templates.freescale.ui,
+   org.eclipse.embedcdt.templates.sifive,
+   org.eclipse.embedcdt.templates.sifive.ui,
+   org.eclipse.embedcdt.templates.stm,
+   org.eclipse.embedcdt.templates.stm.ui,
+   org.eclipse.embedcdt.ui",
+ org.eclipse.embedcdt.core.liqp.parser;
+  x-friends:="org.eclipse.embedcdt,
+   org.eclipse.embedcdt.codered,
+   org.eclipse.embedcdt.codered.ui,
+   org.eclipse.embedcdt.core,
+   org.eclipse.embedcdt.debug.core,
+   org.eclipse.embedcdt.debug.gdbjtag,
+   org.eclipse.embedcdt.debug.gdbjtag.core,
+   org.eclipse.embedcdt.debug.gdbjtag.jlink,
+   org.eclipse.embedcdt.debug.gdbjtag.jlink.core,
+   org.eclipse.embedcdt.debug.gdbjtag.jlink.ui,
+   org.eclipse.embedcdt.debug.gdbjtag.openocd,
+   org.eclipse.embedcdt.debug.gdbjtag.openocd.core,
+   org.eclipse.embedcdt.debug.gdbjtag.openocd.ui,
+   org.eclipse.embedcdt.debug.gdbjtag.pyocd,
+   org.eclipse.embedcdt.debug.gdbjtag.pyocd.core,
+   org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui,
+   org.eclipse.embedcdt.debug.gdbjtag.qemu,
+   org.eclipse.embedcdt.debug.gdbjtag.qemu.core,
+   org.eclipse.embedcdt.debug.gdbjtag.qemu.ui,
+   org.eclipse.embedcdt.debug.gdbjtag.restart.ui,
+   org.eclipse.embedcdt.debug.gdbjtag.ui,
+   org.eclipse.embedcdt.debug.packs,
+   org.eclipse.embedcdt.doc.user,
+   org.eclipse.embedcdt.managedbuild.cross,
+   org.eclipse.embedcdt.managedbuild.cross.arm,
+   org.eclipse.embedcdt.managedbuild.cross.arm.core,
+   org.eclipse.embedcdt.managedbuild.cross.arm.ui,
+   org.eclipse.embedcdt.managedbuild.cross.core,
+   org.eclipse.embedcdt.managedbuild.cross.riscv,
+   org.eclipse.embedcdt.managedbuild.cross.riscv.core,
+   org.eclipse.embedcdt.managedbuild.cross.riscv.ui,
+   org.eclipse.embedcdt.managedbuild.cross.ui,
+   org.eclipse.embedcdt.managedbuild.packs.ui,
+   org.eclipse.embedcdt.packs,
+   org.eclipse.embedcdt.packs.core,
+   org.eclipse.embedcdt.packs.ui,
+   org.eclipse.embedcdt.templates.ad,
+   org.eclipse.embedcdt.templates.ad.ui,
+   org.eclipse.embedcdt.templates.core,
+   org.eclipse.embedcdt.templates.cortexm,
+   org.eclipse.embedcdt.templates.cortexm.ui,
+   org.eclipse.embedcdt.templates.freescale,
+   org.eclipse.embedcdt.templates.freescale.pe.ui,
+   org.eclipse.embedcdt.templates.freescale.ui,
+   org.eclipse.embedcdt.templates.sifive,
+   org.eclipse.embedcdt.templates.sifive.ui,
+   org.eclipse.embedcdt.templates.stm,
+   org.eclipse.embedcdt.templates.stm.ui,
+   org.eclipse.embedcdt.ui",
+ org.eclipse.embedcdt.core.liqp.tags;
+  x-friends:="org.eclipse.embedcdt,
+   org.eclipse.embedcdt.codered,
+   org.eclipse.embedcdt.codered.ui,
+   org.eclipse.embedcdt.core,
+   org.eclipse.embedcdt.debug.core,
+   org.eclipse.embedcdt.debug.gdbjtag,
+   org.eclipse.embedcdt.debug.gdbjtag.core,
+   org.eclipse.embedcdt.debug.gdbjtag.jlink,
+   org.eclipse.embedcdt.debug.gdbjtag.jlink.core,
+   org.eclipse.embedcdt.debug.gdbjtag.jlink.ui,
+   org.eclipse.embedcdt.debug.gdbjtag.openocd,
+   org.eclipse.embedcdt.debug.gdbjtag.openocd.core,
+   org.eclipse.embedcdt.debug.gdbjtag.openocd.ui,
+   org.eclipse.embedcdt.debug.gdbjtag.pyocd,
+   org.eclipse.embedcdt.debug.gdbjtag.pyocd.core,
+   org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui,
+   org.eclipse.embedcdt.debug.gdbjtag.qemu,
+   org.eclipse.embedcdt.debug.gdbjtag.qemu.core,
+   org.eclipse.embedcdt.debug.gdbjtag.qemu.ui,
+   org.eclipse.embedcdt.debug.gdbjtag.restart.ui,
+   org.eclipse.embedcdt.debug.gdbjtag.ui,
+   org.eclipse.embedcdt.debug.packs,
+   org.eclipse.embedcdt.doc.user,
+   org.eclipse.embedcdt.managedbuild.cross,
+   org.eclipse.embedcdt.managedbuild.cross.arm,
+   org.eclipse.embedcdt.managedbuild.cross.arm.core,
+   org.eclipse.embedcdt.managedbuild.cross.arm.ui,
+   org.eclipse.embedcdt.managedbuild.cross.core,
+   org.eclipse.embedcdt.managedbuild.cross.riscv,
+   org.eclipse.embedcdt.managedbuild.cross.riscv.core,
+   org.eclipse.embedcdt.managedbuild.cross.riscv.ui,
+   org.eclipse.embedcdt.managedbuild.cross.ui,
+   org.eclipse.embedcdt.managedbuild.packs.ui,
+   org.eclipse.embedcdt.packs,
+   org.eclipse.embedcdt.packs.core,
+   org.eclipse.embedcdt.packs.ui,
+   org.eclipse.embedcdt.templates.ad,
+   org.eclipse.embedcdt.templates.ad.ui,
+   org.eclipse.embedcdt.templates.core,
+   org.eclipse.embedcdt.templates.cortexm,
+   org.eclipse.embedcdt.templates.cortexm.ui,
+   org.eclipse.embedcdt.templates.freescale,
+   org.eclipse.embedcdt.templates.freescale.pe.ui,
+   org.eclipse.embedcdt.templates.freescale.ui,
+   org.eclipse.embedcdt.templates.sifive,
+   org.eclipse.embedcdt.templates.sifive.ui,
+   org.eclipse.embedcdt.templates.stm,
+   org.eclipse.embedcdt.templates.stm.ui,
+   org.eclipse.embedcdt.ui",
  org.eclipse.embedcdt.core.preferences,
  org.eclipse.embedcdt.core.zafarkhaja.semver;
   x-friends:="org.eclipse.embedcdt,
@@ -116,6 +410,56 @@ Export-Package: org.eclipse.embedcdt.core,
    org.eclipse.embedcdt.templates.stm,
    org.eclipse.embedcdt.templates.stm.ui,
    org.eclipse.embedcdt.ui",
+ org.eclipse.embedcdt.core.zafarkhaja.semver.util;
+  x-friends:="org.eclipse.embedcdt,
+   org.eclipse.embedcdt.codered,
+   org.eclipse.embedcdt.codered.ui,
+   org.eclipse.embedcdt.core,
+   org.eclipse.embedcdt.debug.core,
+   org.eclipse.embedcdt.debug.gdbjtag,
+   org.eclipse.embedcdt.debug.gdbjtag.core,
+   org.eclipse.embedcdt.debug.gdbjtag.jlink,
+   org.eclipse.embedcdt.debug.gdbjtag.jlink.core,
+   org.eclipse.embedcdt.debug.gdbjtag.jlink.ui,
+   org.eclipse.embedcdt.debug.gdbjtag.openocd,
+   org.eclipse.embedcdt.debug.gdbjtag.openocd.core,
+   org.eclipse.embedcdt.debug.gdbjtag.openocd.ui,
+   org.eclipse.embedcdt.debug.gdbjtag.pyocd,
+   org.eclipse.embedcdt.debug.gdbjtag.pyocd.core,
+   org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui,
+   org.eclipse.embedcdt.debug.gdbjtag.qemu,
+   org.eclipse.embedcdt.debug.gdbjtag.qemu.core,
+   org.eclipse.embedcdt.debug.gdbjtag.qemu.ui,
+   org.eclipse.embedcdt.debug.gdbjtag.restart.ui,
+   org.eclipse.embedcdt.debug.gdbjtag.ui,
+   org.eclipse.embedcdt.debug.packs,
+   org.eclipse.embedcdt.doc.user,
+   org.eclipse.embedcdt.managedbuild.cross,
+   org.eclipse.embedcdt.managedbuild.cross.arm,
+   org.eclipse.embedcdt.managedbuild.cross.arm.core,
+   org.eclipse.embedcdt.managedbuild.cross.arm.ui,
+   org.eclipse.embedcdt.managedbuild.cross.core,
+   org.eclipse.embedcdt.managedbuild.cross.riscv,
+   org.eclipse.embedcdt.managedbuild.cross.riscv.core,
+   org.eclipse.embedcdt.managedbuild.cross.riscv.ui,
+   org.eclipse.embedcdt.managedbuild.cross.ui,
+   org.eclipse.embedcdt.managedbuild.packs.ui,
+   org.eclipse.embedcdt.packs,
+   org.eclipse.embedcdt.packs.core,
+   org.eclipse.embedcdt.packs.ui,
+   org.eclipse.embedcdt.templates.ad,
+   org.eclipse.embedcdt.templates.ad.ui,
+   org.eclipse.embedcdt.templates.core,
+   org.eclipse.embedcdt.templates.cortexm,
+   org.eclipse.embedcdt.templates.cortexm.ui,
+   org.eclipse.embedcdt.templates.freescale,
+   org.eclipse.embedcdt.templates.freescale.pe.ui,
+   org.eclipse.embedcdt.templates.freescale.ui,
+   org.eclipse.embedcdt.templates.sifive,
+   org.eclipse.embedcdt.templates.sifive.ui,
+   org.eclipse.embedcdt.templates.stm,
+   org.eclipse.embedcdt.templates.stm.ui,
+   org.eclipse.embedcdt.ui",
  org.json.simple;version="1.1.1";
   x-friends:="org.eclipse.embedcdt.debug.gdbjtag.core,
    org.eclipse.embedcdt,