diff --git a/cms-core/pom.xml b/cms-core/pom.xml
index c12c589e9e..112a8ad3be 100644
--- a/cms-core/pom.xml
+++ b/cms-core/pom.xml
@@ -436,6 +436,16 @@
 			<artifactId>handlebars</artifactId>
 		</dependency>
 
+		<!-- Groovy -->
+		<dependency>
+			<groupId>org.apache.groovy</groupId>
+			<artifactId>groovy</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.groovy</groupId>
+			<artifactId>groovy-json</artifactId>
+		</dependency>
+
 		<!-- Test dependencies -->
 		<dependency>
 			<groupId>org.glassfish.jersey.containers</groupId>
diff --git a/cms-core/src/main/java/com/gentics/api/ChannelScope.java b/cms-core/src/main/java/com/gentics/api/ChannelScope.java
new file mode 100644
index 0000000000..8b7c65a9a9
--- /dev/null
+++ b/cms-core/src/main/java/com/gentics/api/ChannelScope.java
@@ -0,0 +1,40 @@
+package com.gentics.api;
+
+import com.gentics.api.lib.exception.NodeException;
+import com.gentics.contentnode.factory.ChannelTrx;
+import com.gentics.contentnode.factory.NoMcTrx;
+import com.gentics.contentnode.object.Node;
+import com.gentics.contentnode.object.parttype.NodePartType;
+import com.gentics.contentnode.render.RenderUtils;
+
+import groovy.lang.Closure;
+
+/**
+ * Channel Scope helper which should be used in Groovy Scripts to load objects in the scope of channels
+ */
+public class ChannelScope {
+	/**
+	 * Private constructor
+	 */
+	private ChannelScope() {
+	}
+
+	/**
+	 * Run the closure body in a {@link ChannelTrx}
+	 * @param <T> type of the return value
+	 * @param scope scope (channel)
+	 * @param body closure body
+	 * @return return value
+	 * @throws NodeException
+	 */
+	public static <T> T withChannel(Object scope, Closure<T> body) throws NodeException {
+		Node node = null;
+		try (final NoMcTrx nMcTrx = new NoMcTrx()) {
+			node = RenderUtils.getObject(scope, Node.class, NodePartType.class, NodePartType::getNode);
+		}
+
+		try (ChannelTrx cTrx = new ChannelTrx(node)) {
+			return body.call(cTrx);
+		}
+	}
+}
diff --git a/cms-core/src/main/java/com/gentics/api/Loader.java b/cms-core/src/main/java/com/gentics/api/Loader.java
new file mode 100644
index 0000000000..44529d12a9
--- /dev/null
+++ b/cms-core/src/main/java/com/gentics/api/Loader.java
@@ -0,0 +1,220 @@
+package com.gentics.api;
+
+import static com.gentics.contentnode.render.RenderUtils.wrap;
+
+import java.util.Map;
+
+import com.gentics.api.lib.exception.NodeException;
+import com.gentics.api.lib.resolving.Resolvable;
+import com.gentics.contentnode.factory.Transaction;
+import com.gentics.contentnode.factory.TransactionManager;
+import com.gentics.contentnode.object.File;
+import com.gentics.contentnode.object.Folder;
+import com.gentics.contentnode.object.ImageFile;
+import com.gentics.contentnode.object.Node;
+import com.gentics.contentnode.object.NodeObject;
+import com.gentics.contentnode.object.Page;
+import com.gentics.lib.log.NodeLogger;
+
+/**
+ * Loader helper, which should be used in Groovy Scripts to load objects
+ */
+public class Loader {
+	private static NodeLogger logger = NodeLogger.getNodeLogger(Loader.class);
+
+	/**
+	 * Map of types to type ids
+	 */
+	private final static Map<String, Integer> TYPES = Map.of(
+			"page", Page.TYPE_PAGE,
+			"folder", Folder.TYPE_FOLDER,
+			"file", File.TYPE_FILE,
+			"image", ImageFile.TYPE_IMAGE,
+			"node", Node.TYPE_NODE);
+
+	/**
+	 * Private constructor
+	 */
+	private Loader() {
+	}
+
+	/**
+	 * Load object with given type and id
+	 * @param type object type
+	 * @param id object id (as integer)
+	 * @return loaded object or null, if not found
+	 * @throws NodeException
+	 */
+	public static Resolvable object(int type, int id) throws NodeException {
+		Transaction t = TransactionManager.getCurrentTransaction();
+
+		Class<? extends NodeObject> clazz = t.getClass(type);
+		if (clazz == null) {
+			logger.warn("Unable to load object of unknown type ID %d".formatted(type));
+			return null;
+		}
+
+		NodeObject object = t.getObject(clazz, id);
+		if (object == null && type == File.TYPE_FILE) {
+			return object(ImageFile.TYPE_IMAGE, id);
+		}
+
+		return wrap(object);
+	}
+
+	/**
+	 * Load object with given type and id
+	 * @param type object type
+	 * @param id object id (as string)
+	 * @return loaded object or null, if not found
+	 * @throws NodeException
+	 */
+	public static Resolvable object(int type, String id) throws NodeException {
+		Transaction t = TransactionManager.getCurrentTransaction();
+
+		Class<? extends NodeObject> clazz = t.getClass(type);
+		if (clazz == null) {
+			logger.warn("Unable to load object of unknown type ID %d".formatted(type));
+			return null;
+		}
+
+		NodeObject object = t.getObject(clazz, id);
+		if (object == null && type == File.TYPE_FILE) {
+			return object(ImageFile.TYPE_IMAGE, id);
+		}
+
+		return wrap(object);
+	}
+
+	/**
+	 * Load object with given type and id
+	 * @param type type
+	 * @param id id (as integer)
+	 * @return loaded object or null, if not found
+	 * @throws NodeException
+	 */
+	public static Resolvable object(String type, int id) throws NodeException {
+		if (TYPES.containsKey(type)) {
+			return object(TYPES.get(type), id);
+		} else {
+			logger.warn("Unable to load object of unknown type %s".formatted(type));
+			return null;
+		}
+	}
+
+	/**
+	 * Load object with given type and id
+	 * @param type type
+	 * @param id id (as string)
+	 * @return loaded object or null, if not found
+	 * @throws NodeException
+	 */
+	public static Resolvable object(String type, String id) throws NodeException {
+		if (TYPES.containsKey(type)) {
+			return object(TYPES.get(type), id);
+		} else {
+			logger.warn("Unable to load object of unknown type %s".formatted(type));
+			return null;
+		}
+	}
+
+	/**
+	 * Load page
+	 * @param id page id
+	 * @return wrapped page
+	 * @throws NodeException
+	 */
+	public static Resolvable page(int id) throws NodeException {
+		return object(Page.TYPE_PAGE, id);
+	}
+
+	/**
+	 * Load page
+	 * @param id page id
+	 * @return wrapped page
+	 * @throws NodeException
+	 */
+	public static Resolvable page(String id) throws NodeException {
+		return object(Page.TYPE_PAGE, id);
+	}
+
+	/**
+	 * Load folder
+	 * @param id folder id
+	 * @return wrapped folder
+	 * @throws NodeException
+	 */
+	public static Resolvable folder(int id) throws NodeException {
+		return object(Folder.TYPE_FOLDER, id);
+	}
+
+	/**
+	 * Load folder
+	 * @param id folder id
+	 * @return wrapped folder
+	 * @throws NodeException
+	 */
+	public static Resolvable folder(String id) throws NodeException {
+		return object(Folder.TYPE_FOLDER, id);
+	}
+
+	/**
+	 * Load file
+	 * @param id file id
+	 * @return wrapped file
+	 * @throws NodeException
+	 */
+	public static Resolvable file(int id) throws NodeException {
+		return object(File.TYPE_FILE, id);
+	}
+
+	/**
+	 * Load file
+	 * @param id file id
+	 * @return wrapped file
+	 * @throws NodeException
+	 */
+	public static Resolvable file(String id) throws NodeException {
+		return object(File.TYPE_FILE, id);
+	}
+
+	/**
+	 * Load image
+	 * @param id image id
+	 * @return wrapped image
+	 * @throws NodeException
+	 */
+	public static Resolvable image(int id) throws NodeException {
+		return object(ImageFile.TYPE_IMAGE, id);
+	}
+
+	/**
+	 * Load image
+	 * @param id image id
+	 * @return wrapped image
+	 * @throws NodeException
+	 */
+	public static Resolvable image(String id) throws NodeException {
+		return object(ImageFile.TYPE_IMAGE, id);
+	}
+
+	/**
+	 * Load node
+	 * @param id node id
+	 * @return wrapped node
+	 * @throws NodeException
+	 */
+	public static Resolvable node(int id) throws NodeException {
+		return object(Node.TYPE_NODE, id);
+	}
+
+	/**
+	 * Load node
+	 * @param id node id
+	 * @return wrapped node
+	 * @throws NodeException
+	 */
+	public static Resolvable node(String id) throws NodeException {
+		return object(Node.TYPE_NODE, id);
+	}
+}
diff --git a/cms-core/src/main/java/com/gentics/contentnode/devtools/AbstractSynchronizer.java b/cms-core/src/main/java/com/gentics/contentnode/devtools/AbstractSynchronizer.java
index bfde4df53f..8eeac9f107 100644
--- a/cms-core/src/main/java/com/gentics/contentnode/devtools/AbstractSynchronizer.java
+++ b/cms-core/src/main/java/com/gentics/contentnode/devtools/AbstractSynchronizer.java
@@ -28,6 +28,7 @@
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.output.NullOutputStream;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 
 import com.gentics.api.lib.etc.ObjectTransformer;
 import com.gentics.api.lib.exception.NodeException;
@@ -559,8 +560,10 @@ protected void jsonToFile(Object object, File file) throws NodeException {
 	 */
 	protected String getProposedFilename(Part part) {
 		// special case for HandlebarsPartType
-		if (part.getPartTypeId() == 43) {
+		if (part.getPartTypeId() == Part.HANDLEBARS) {
 			return "part." + part.getKeyname() + ".hbs";
+		} else if (part.getPartTypeId() == Part.GROOVY) {
+			return "part." + part.getKeyname() + ".groovy";
 		}
 		switch (Property.Type.get(part.getPartTypeId())) {
 		case STRING:
@@ -593,7 +596,7 @@ protected boolean isJsonFile(Part part) {
 	 * @return true iff the filename belongs to a part value
 	 */
 	protected boolean isPartFilename(String filename) {
-		return filename.startsWith("part.") && (filename.endsWith(".txt") || filename.endsWith(".html") || filename.endsWith(".json") || filename.endsWith(".hbs"));
+		return Strings.CI.startsWith(filename, "part.") && Strings.CI.endsWithAny(filename, ".txt", ".html", ".json", ".hbs", ".groovy");
 	}
 
 	/**
diff --git a/cms-core/src/main/java/com/gentics/contentnode/devtools/MainPackageSynchronizer.java b/cms-core/src/main/java/com/gentics/contentnode/devtools/MainPackageSynchronizer.java
index da16c49a5d..d1b6c3cbc6 100644
--- a/cms-core/src/main/java/com/gentics/contentnode/devtools/MainPackageSynchronizer.java
+++ b/cms-core/src/main/java/com/gentics/contentnode/devtools/MainPackageSynchronizer.java
@@ -38,7 +38,7 @@ public class MainPackageSynchronizer extends PackageSynchronizer {
 	 * List containing invalid subpackage directory names
 	 */
 	public final static List<String> INVALID_SUBPACKAGE_NAMES = Arrays.asList(CONSTRUCTS_DIR, DATASOURCES_DIR, OBJECTPROPERTIES_DIR, TEMPLATES_DIR, FILES_DIR,
-			CR_FRAGMENTS_DIR, CONTENTREPOSITORIES_DIR, HANDLEBARS_DIR);
+			CR_FRAGMENTS_DIR, CONTENTREPOSITORIES_DIR, HANDLEBARS_DIR, SCRIPTS_DIR);
 
 	/**
 	 * Lambda that generates the rest model for a package
diff --git a/cms-core/src/main/java/com/gentics/contentnode/devtools/PackageSynchronizer.java b/cms-core/src/main/java/com/gentics/contentnode/devtools/PackageSynchronizer.java
index 2b459f92af..f19f5ee15f 100644
--- a/cms-core/src/main/java/com/gentics/contentnode/devtools/PackageSynchronizer.java
+++ b/cms-core/src/main/java/com/gentics/contentnode/devtools/PackageSynchronizer.java
@@ -7,7 +7,6 @@
 import java.io.IOException;
 import java.io.Reader;
 import java.io.StringWriter;
-import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.FileVisitResult;
 import java.nio.file.Files;
@@ -27,7 +26,7 @@
 import java.util.function.Consumer;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 import org.tautua.markdownpapers.Markdown;
 
 import com.gentics.api.lib.exception.NodeException;
@@ -97,6 +96,11 @@ public abstract class PackageSynchronizer {
 	 */
 	public final static String HANDLEBARS_DIR = "handlebars";
 
+	/**
+	 * Name of the subdirectory containing (groovy) scripts
+	 */
+	public final static String SCRIPTS_DIR = "scripts";
+
 	/**
 	 * Directory map for object class
 	 */
@@ -186,6 +190,16 @@ public PackageSynchronizer(Path packagePath, boolean registerWatchers) throws No
 			// clean the cached handlebars helpers
 			handlebarsHelpers = null;
 		});
+		// add a handler for changes in the scripts directory
+		pathHandlers.put(new File(packagePath.toFile(), SCRIPTS_DIR).toPath(), changedPath -> {
+			try {
+				for (Node node : getNodes()) {
+					Synchronizer.invalidateGroovyClassLoader(node);
+				}
+			} catch (NodeException e) {
+				Synchronizer.invalidateGroovyClassLoader();
+			}
+		});
 		if (registerWatchers) {
 			try {
 				Synchronizer.registerAll(packagePath);
@@ -516,11 +530,11 @@ public String getHandlebarsHelpers() throws IOException {
 
 			if (helpersDirectory.isDirectory()) {
 				StringBuilder registerHelpers = new StringBuilder();
-				File[] files = helpersDirectory.listFiles((dir, name) -> StringUtils.endsWith(name, ".js"));
+				File[] files = helpersDirectory.listFiles((dir, name) -> Strings.CI.endsWith(name, ".js"));
 
 				if (files != null) {
 					for (File helperFile : files) {
-						String helperNameShort = StringUtils.removeEnd(helperFile.getName(), ".js");
+						String helperNameShort = Strings.CI.removeEnd(helperFile.getName(), ".js");
 						String helperName = String.format("%s.%s", packageName, helperNameShort);
 						String helperFileContents = FileUtils.readFileToString(helperFile, StandardCharsets.UTF_8);
 						String register = String.format("Handlebars.registerHelper('%s', %s)", helperName, helperFileContents);
@@ -547,6 +561,20 @@ public File getHandlebarsPartialsDirectory() {
 		return new File(handlebarsDirectory, "partials");
 	}
 
+	/**
+	 * Get the script files of the package
+	 * @return script files
+	 */
+	public File[] getScriptFiles() {
+		File scriptsDirectory = new File(this.packagePath.toFile(), SCRIPTS_DIR);
+
+		if (scriptsDirectory.isDirectory()) {
+			return scriptsDirectory.listFiles((dir, name) -> Strings.CI.endsWith(name, ".groovy"));
+		}
+
+		return new File[0];
+	}
+
 	/**
 	 * Add a synchronizer implementation
 	 * @param path base path
diff --git a/cms-core/src/main/java/com/gentics/contentnode/devtools/Synchronizer.java b/cms-core/src/main/java/com/gentics/contentnode/devtools/Synchronizer.java
index d400a59dd9..bafd545639 100644
--- a/cms-core/src/main/java/com/gentics/contentnode/devtools/Synchronizer.java
+++ b/cms-core/src/main/java/com/gentics/contentnode/devtools/Synchronizer.java
@@ -20,7 +20,12 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.io.FileUtils;
+import org.codehaus.groovy.control.CompilationUnit;
+import org.codehaus.groovy.control.CompilerConfiguration;
+import org.codehaus.groovy.control.Phases;
+import org.codehaus.groovy.tools.GroovyClass;
 
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -36,7 +41,9 @@
 import com.gentics.contentnode.etc.NodePreferences;
 import com.gentics.contentnode.etc.PrefixedThreadFactory;
 import com.gentics.contentnode.etc.QueueWithDelay;
+import com.gentics.contentnode.etc.Timing;
 import com.gentics.contentnode.factory.Transaction;
+import com.gentics.contentnode.i18n.I18NHelper;
 import com.gentics.contentnode.object.Construct;
 import com.gentics.contentnode.object.ContentRepository;
 import com.gentics.contentnode.object.Datasource;
@@ -52,6 +59,8 @@
 import com.gentics.lib.etc.StringUtils;
 import com.gentics.lib.log.NodeLogger;
 
+import groovy.lang.GroovyClassLoader;
+
 /**
  * Synchronization implementation for the {@link Feature#DEVTOOLS}
  */
@@ -142,6 +151,11 @@ public class Synchronizer {
 	 */
 	private static ObjectMapper alternateMapper;
 
+	/**
+	 * Map of {@link GroovyClassLoader} instances per Node
+	 */
+	private static Map<Node, GroovyClassLoader> groovyClassLoaderPerNode = MapUtils.synchronizedMap(new HashMap<>());
+
 	static {
 		AtomicInteger priority = new AtomicInteger();
 		for (Class<? extends SynchronizableNodeObject> clazz : CLASSES) {
@@ -470,6 +484,9 @@ public static void removePackage(Node node, String packageName) throws NodeExcep
 			st.setInt(1, node.getId());
 			st.setString(2, packageName);
 		});
+
+		// invalidate the groovy classloader for the node
+		invalidateGroovyClassLoader(node);
 	}
 
 	/**
@@ -494,9 +511,62 @@ public static void addPackage(Node node, String packageName) throws NodeExceptio
 			AbstractSynchronizer<? extends SynchronizableNodeObject, ? extends AbstractModel> synchronizer = packageSynchronizer.synchronizersPerClass
 					.get(clazz);
 			synchronizer.assignAll(node);
-			}
 		}
 
+		// invalidate the groovy classloader for the node
+		invalidateGroovyClassLoader(node);
+	}
+
+	/**
+	 * Get the {@link GroovyClassLoader} instance for the given Node. The class loader will contain all
+	 * classes compiled from scripts found in packages, which are assigned to the node
+	 * @param node
+	 * @return
+	 * @throws NodeException
+	 */
+	public static GroovyClassLoader getGroovyClassLoader(Node node) throws NodeException {
+		Set<String> nodePackages = Synchronizer.getPackages(node);
+
+		return groovyClassLoaderPerNode.computeIfAbsent(node, n -> {
+			CompilerConfiguration config = new CompilerConfiguration();
+
+			GroovyClassLoader gcl = new GroovyClassLoader(Synchronizer.class.getClassLoader(), config);
+
+			try (Timing timing = Timing.get(-1, duration -> {
+				logger.info("Compiled scripts for node %s in %d ms".formatted(I18NHelper.getName(node), duration));
+			})) {
+				CompilationUnit unit = new CompilationUnit(config, null, gcl);
+				for (String packageName : nodePackages) {
+					MainPackageSynchronizer mainPack = Synchronizer.getPackage(packageName);
+					unit.addSources(mainPack.getScriptFiles());
+				}
+				unit.compile(Phases.CLASS_GENERATION);
+
+				for (GroovyClass groovyClass : unit.getClasses()) {
+					gcl.defineClass(groovyClass.getName(), groovyClass.getBytes());
+				}
+			} catch (NodeException ignored) {
+			}
+
+			return gcl;
+		});
+	}
+
+	/**
+	 * Invalidate the {@link GroovyClassLoader} for the give node
+	 * @param node node
+	 */
+	public static void invalidateGroovyClassLoader(Node node) {
+		groovyClassLoaderPerNode.remove(node);
+	}
+
+	/**
+	 * Invalidate the {@link GroovyClassLoader} for all nodes
+	 */
+	public static void invalidateGroovyClassLoader() {
+		groovyClassLoaderPerNode.clear();
+	}
+
 	/**
 	 * Get the package synchronizer for the given path or null
 	 * @param path path
@@ -530,6 +600,7 @@ public static void removePackageSynchronizer(PackageContainer<?> container, Path
 	 */
 	public static void clearCache() {
 		container.clearCache();
+		invalidateGroovyClassLoader();
 	}
 
 	/**
diff --git a/cms-core/src/main/java/com/gentics/contentnode/object/Part.java b/cms-core/src/main/java/com/gentics/contentnode/object/Part.java
index ef03139901..a1d8f38a58 100644
--- a/cms-core/src/main/java/com/gentics/contentnode/object/Part.java
+++ b/cms-core/src/main/java/com/gentics/contentnode/object/Part.java
@@ -70,7 +70,9 @@ public abstract class Part extends AbstractContentObject implements I18nNamedNod
 	public static final int FILEUPLOAD = 38;
 	public static final int FOLDERUPLOAD = 39;
 	public static final int NODE = 40;
-	
+	public static final int HANDLEBARS = 43;
+	public static final int GROOVY = 45;
+
 	/**
 	 * The ttype of the part object.
 	 */
diff --git a/cms-core/src/main/java/com/gentics/contentnode/object/parttype/groovy/GroovyPartType.java b/cms-core/src/main/java/com/gentics/contentnode/object/parttype/groovy/GroovyPartType.java
new file mode 100644
index 0000000000..e60b0bcc6e
--- /dev/null
+++ b/cms-core/src/main/java/com/gentics/contentnode/object/parttype/groovy/GroovyPartType.java
@@ -0,0 +1,120 @@
+package com.gentics.contentnode.object.parttype.groovy;
+
+import java.util.Optional;
+
+import org.apache.commons.lang3.StringUtils;
+import org.codehaus.groovy.control.CompilationFailedException;
+import org.codehaus.groovy.control.CompilationUnit;
+import org.codehaus.groovy.control.Phases;
+import org.codehaus.groovy.tools.GroovyClass;
+
+import com.gentics.api.lib.exception.NodeException;
+import com.gentics.contentnode.factory.Transaction;
+import com.gentics.contentnode.factory.TransactionManager;
+import com.gentics.contentnode.object.Construct;
+import com.gentics.contentnode.object.Part;
+import com.gentics.contentnode.object.Tag;
+import com.gentics.contentnode.object.Value;
+import com.gentics.contentnode.object.ValueContainer;
+import com.gentics.contentnode.object.parttype.TextPartType;
+import com.gentics.contentnode.render.RenderResult;
+import com.gentics.contentnode.render.RenderType;
+import com.gentics.contentnode.resolving.NodeObjectResolverContext;
+import com.gentics.contentnode.resolving.ResolvableGetter;
+import com.gentics.contentnode.rest.model.Property;
+import com.gentics.contentnode.rest.model.Property.Type;
+import com.gentics.contentnode.rest.util.MiscUtils;
+import com.gentics.contentnode.utils.GroovyUtils;
+
+/**
+ * Implementation of the Groovy PartType
+ */
+public class GroovyPartType extends TextPartType {
+
+	private static final long serialVersionUID = 416330914123548280L;
+
+	/**
+	 * Create an instance
+	 * @param value value
+	 * @throws NodeException
+	 */
+	public GroovyPartType(Value value) throws NodeException {
+		super(value);
+	}
+
+	/**
+	 * Execute the groovy script
+	 * @return
+	 * @throws NodeException
+	 */
+	@ResolvableGetter
+	public Object getExecute() throws NodeException {
+		String code = getText();
+
+		if (StringUtils.isBlank(code)) {
+			return null;
+		}
+
+		Transaction t = TransactionManager.getCurrentTransaction();
+		RenderType renderType = t.getRenderType();
+
+		Tag tag = NodeObjectResolverContext.getNodeObject(Tag.class);
+
+		if (null != tag) {
+			renderType.push(tag);
+		}
+		try {
+			renderType.createCMSResolver();
+			try {
+				CompilationUnit unit = GroovyUtils.getCurrentCompilationUnit();
+
+				Value value = getValueObject();
+				String constructKeyword = Optional.ofNullable(value).map(v -> MiscUtils.execOrNull(Value::getContainer, v))
+						.map(cont -> MiscUtils.execOrNull(ValueContainer::getConstruct, cont)).map(Construct::getKeyword)
+						.orElse("<unknown>");
+				String partKeyword = Optional.ofNullable(value).map(v -> MiscUtils.execOrNull(Value::getPart, v))
+						.map(Part::getKeyname).orElse("<unknown>");
+				int valueId = Optional.ofNullable(value).map(Value::getId).orElse(0);
+				String scriptClassName = "%s_%s_%d".formatted(constructKeyword, partKeyword, valueId);
+				String scriptName = "%s.groovy".formatted(scriptClassName);
+
+				// check whether the unit already contains the class
+				GroovyClass groovyClass = GroovyUtils.findGroovyClass(unit, scriptClassName);
+
+				// class does not exist, so add it to the compilation unit and compile
+				if (groovyClass == null) {
+					unit.addSource(scriptName, code);
+					unit.compile(Phases.CLASS_GENERATION);
+
+					// when compiled, add it to the class path
+					groovyClass = GroovyUtils.findGroovyClass(unit, scriptClassName);
+					if (groovyClass != null) {
+						unit.getClassLoader().defineClass(groovyClass.getName(), groovyClass.getBytes());
+					}
+				}
+
+				return GroovyUtils.call(unit.getClassLoader(), scriptClassName, script -> {
+					GroovyUtils.injectCmsResolver(script);
+				});
+			} catch (CompilationFailedException e) {
+				throw new NodeException(e);
+			} finally {
+				renderType.popCMSResolver();
+			}
+		} finally {
+			if (tag != null) {
+				renderType.pop(tag);
+			}
+		}
+	}
+
+	@Override
+	public Type getPropertyType() {
+		return Property.Type.RICHTEXT;
+	}
+
+	@Override
+	public String render(RenderResult result, String template) throws NodeException {
+		return "";
+	}
+}
diff --git a/cms-core/src/main/java/com/gentics/contentnode/object/parttype/handlebars/HelperSource.java b/cms-core/src/main/java/com/gentics/contentnode/object/parttype/handlebars/HelperSource.java
index 665bf029eb..9fb7a8c016 100644
--- a/cms-core/src/main/java/com/gentics/contentnode/object/parttype/handlebars/HelperSource.java
+++ b/cms-core/src/main/java/com/gentics/contentnode/object/parttype/handlebars/HelperSource.java
@@ -12,6 +12,8 @@
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.ListUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
+import org.codehaus.groovy.control.CompilationUnit;
 
 import com.gentics.api.lib.datasource.Datasource;
 import com.gentics.api.lib.etc.ObjectTransformer;
@@ -40,8 +42,10 @@
 import com.gentics.contentnode.resolving.ResolvableMapWrappable;
 import com.gentics.contentnode.resolving.ResolvableMapWrapper;
 import com.gentics.contentnode.resolving.ResolvableMapWrapper.RenderContext;
+import com.gentics.contentnode.utils.GroovyUtils;
 import com.gentics.lib.render.Renderable;
 import com.github.jknack.handlebars.Options;
+import com.github.jknack.handlebars.helper.HelperFunction;
 
 /**
  * Source for helpers used when rendering a {@link HandlebarsPartType}
@@ -153,7 +157,7 @@ public static Collection<Object> gtx_sort(Object objects, String sortBy, String
 		}
 
 		int iSortOrder = Datasource.SORTORDER_ASC;
-		if (StringUtils.equalsIgnoreCase(sortOrder, "desc")) {
+		if (Strings.CI.equals(sortOrder, "desc")) {
 			iSortOrder = Datasource.SORTORDER_DESC;
 		}
 
@@ -228,4 +232,24 @@ public static CharSequence gtx_i18n(Object object, Options options) throws NodeE
 
 		return null;
 	}
+
+	/**
+	 * Script helper for calling groovy scripts (from devtool packages)
+	 * @param name script name
+	 * @param options additional options
+	 * @return return value of the script
+	 * @throws NodeException
+	 */
+	@HelperFunction("gtx_script")
+	public static Object callScript(String name, Options options) throws NodeException {
+		CompilationUnit unit = GroovyUtils.getCurrentCompilationUnit();
+
+		return GroovyUtils.call(unit.getClassLoader(), name, script -> {
+			GroovyUtils.injectCmsResolver(script);
+
+			for (String key : options.hash.keySet()) {
+				script.setProperty(key, options.hash.get(key));
+			}
+		});
+	}
 }
diff --git a/cms-core/src/main/java/com/gentics/contentnode/publish/Publisher.java b/cms-core/src/main/java/com/gentics/contentnode/publish/Publisher.java
index a97fc764ad..4aee7b7f02 100644
--- a/cms-core/src/main/java/com/gentics/contentnode/publish/Publisher.java
+++ b/cms-core/src/main/java/com/gentics/contentnode/publish/Publisher.java
@@ -51,6 +51,7 @@
 import com.gentics.contentnode.factory.object.FileOnlineStatus;
 import com.gentics.contentnode.factory.object.FormFactory;
 import com.gentics.contentnode.factory.url.StaticUrlFactory;
+import com.gentics.contentnode.i18n.I18NHelper;
 import com.gentics.contentnode.image.CNGenticsImageStore;
 import com.gentics.contentnode.image.CNGenticsImageStore.ImageInformation;
 import com.gentics.contentnode.jmx.MBeanRegistry;
@@ -72,6 +73,7 @@
 import com.gentics.contentnode.render.RenderType;
 import com.gentics.contentnode.runtime.ConfigurationValue;
 import com.gentics.contentnode.runtime.NodeConfigRuntimeConfiguration;
+import com.gentics.contentnode.utils.GroovyUtils;
 import com.gentics.lib.content.FilesystemAttributeValue;
 import com.gentics.lib.datasource.mccr.MCCRHelper;
 import com.gentics.lib.db.SQLExecutor;
@@ -84,6 +86,8 @@
 import com.gentics.lib.log.profilerconstants.JavaParserConstants;
 import com.gentics.lib.render.exception.PublishException;
 
+import groovy.lang.GroovyRuntimeException;
+
 /**
  * Main publish process class. This implements and controls the publish process.
  *
@@ -1029,6 +1033,20 @@ private Map<Integer, Integer> initializeWorkPhases(List<Node> publishedNodes, Me
 			if (renderResult != null) {
 				renderResult.info(Publisher.class, "Marking changes about to be published in this run");
 			}
+
+			// get the Scripts CompilationUnits for all published nodes. This will probably compile the scripts used for the nodes
+			// and will fail if not all scripts can be compiled
+			RenderType renderType = TransactionManager.getCurrentTransaction().getRenderType();
+			for (Node node : publishedNodes) {
+				if (!node.isChannel()) {
+					try {
+						renderType.getCompilationUnit(node);
+					} catch (GroovyRuntimeException e) {
+						throw new NodeException("Error while compiling scripts for %s".formatted(I18NHelper.getName(node)), e);
+					}
+				}
+			}
+
 			objectsToPublishCount = PublishQueue.startPublishProcess(publishedNodes);
 
 			// set the number of objects to publish into the JMX bean
diff --git a/cms-core/src/main/java/com/gentics/contentnode/render/RenderType.java b/cms-core/src/main/java/com/gentics/contentnode/render/RenderType.java
index f9cf9913dc..1dcab58669 100644
--- a/cms-core/src/main/java/com/gentics/contentnode/render/RenderType.java
+++ b/cms-core/src/main/java/com/gentics/contentnode/render/RenderType.java
@@ -2,7 +2,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -15,10 +14,10 @@
 import java.util.Stack;
 import java.util.Vector;
 
-import com.gentics.contentnode.utils.ResourcePath;
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.codehaus.groovy.control.CompilationUnit;
+import org.codehaus.groovy.control.CompilerConfiguration;
 
 import com.gentics.api.lib.etc.ObjectTransformer;
 import com.gentics.api.lib.exception.NodeException;
@@ -51,6 +50,7 @@
 import com.gentics.contentnode.object.parttype.handlebars.HelperSource;
 import com.gentics.contentnode.resolving.StackResolvable;
 import com.gentics.contentnode.resolving.StackResolver;
+import com.gentics.contentnode.utils.ResourcePath;
 import com.gentics.lib.genericexceptions.NotYetImplementedException;
 import com.gentics.lib.log.NodeLogger;
 import com.gentics.lib.log.RuntimeProfiler;
@@ -61,6 +61,8 @@
 import com.github.jknack.handlebars.helper.StringHelpers;
 import com.github.jknack.handlebars.io.TemplateLoader;
 
+import groovy.lang.GroovyClassLoader;
+
 /**
  * RenderType provides informations and settings about how code should be rendered.
  * The information is stored in a stack, which can be used to quickly change the
@@ -179,6 +181,11 @@ public class RenderType implements RenderInfo {
 	 */
 	private Map<Node, Handlebars> handlebarsPerNode = new HashMap<>();
 
+	/**
+	 * Groovy Compilation Units per Node
+	 */
+	private Map<Node, CompilationUnit> compilationUnitsPerNode = new HashMap<>();
+
 	/**
 	 * A public constructor, which provides the renderType with all required informations.
 	 * @param editMode the editmode to set to the root level.
@@ -1507,6 +1514,34 @@ public Handlebars getHandlebars(Node node) throws NodeException, IOException {
 		return handlebarsPerNode.get(node);
 	}
 
+	/**
+	 * Get the {@link CompilationUnit} instance for the given node. The unit will
+	 * already have the scripts contained in all devtool packages, which are
+	 * assigned to the node compiled and defined in its classloader
+	 * 
+	 * @param node node
+	 * @return unit
+	 * @throws NodeException
+	 */
+	public CompilationUnit getCompilationUnit(Node node) throws NodeException {
+		if (!compilationUnitsPerNode.containsKey(node)) {
+			CompilerConfiguration config = new CompilerConfiguration();
+
+			ClassLoader baseClassLoader;
+			if (Synchronizer.getStatus() == Status.UP) {
+				baseClassLoader = Synchronizer.getGroovyClassLoader(node);
+			} else {
+				baseClassLoader = RenderType.class.getClassLoader();
+			}
+
+			GroovyClassLoader gcl = new GroovyClassLoader(baseClassLoader, config);
+			CompilationUnit unit = new CompilationUnit(config, null, gcl);
+			compilationUnitsPerNode.put(node, unit);
+		}
+
+		return compilationUnitsPerNode.get(node);
+	}
+
 	/**
 	 * AutoCloseable instance that will set the parameter back to the original value when closed
 	 */
diff --git a/cms-core/src/main/java/com/gentics/contentnode/render/RenderUtils.java b/cms-core/src/main/java/com/gentics/contentnode/render/RenderUtils.java
index b436e4206b..32bc7ddd8e 100644
--- a/cms-core/src/main/java/com/gentics/contentnode/render/RenderUtils.java
+++ b/cms-core/src/main/java/com/gentics/contentnode/render/RenderUtils.java
@@ -55,6 +55,7 @@
 import com.gentics.contentnode.parser.tag.struct.ParseStructRenderer;
 import com.gentics.contentnode.publish.FilePublisher;
 import com.gentics.contentnode.publish.mesh.MeshPublisher;
+import com.gentics.contentnode.resolving.ResolvableMapWrappable;
 import com.gentics.contentnode.resolving.ResolvableMapWrapper;
 import com.gentics.contentnode.rest.model.ContentRepositoryModel.Type;
 import com.gentics.contentnode.runtime.NodeConfigRuntimeConfiguration;
@@ -366,6 +367,21 @@ public static <T extends NodeObject, P extends PartType> T getObject(Object obje
 		return null;
 	}
 
+	/**
+	 * Wrap the object for returning
+	 * @param object object to wrap
+	 * @return wrapped object
+	 */
+	public static Resolvable wrap(NodeObject object) {
+		if (object instanceof ResolvableMapWrappable wrappable) {
+			return new ResolvableMapWrapper(wrappable);
+		} else if (object != null) {
+			return new RenderableResolvable(object);
+		} else {
+			return null;
+		}
+	}
+
 	/**
 	 * Unwrap instances of {@link ResolvableMapWrapper} (recursively)
 	 * @param object object to unwrap
diff --git a/cms-core/src/main/java/com/gentics/contentnode/utils/GroovyUtils.java b/cms-core/src/main/java/com/gentics/contentnode/utils/GroovyUtils.java
new file mode 100644
index 0000000000..cf573b52d5
--- /dev/null
+++ b/cms-core/src/main/java/com/gentics/contentnode/utils/GroovyUtils.java
@@ -0,0 +1,98 @@
+package com.gentics.contentnode.utils;
+
+import org.apache.commons.lang3.Strings;
+import org.codehaus.groovy.control.CompilationUnit;
+import org.codehaus.groovy.tools.GroovyClass;
+
+import com.gentics.api.lib.etc.ObjectTransformer;
+import com.gentics.api.lib.exception.NodeException;
+import com.gentics.contentnode.etc.Consumer;
+import com.gentics.contentnode.factory.TransactionManager;
+import com.gentics.contentnode.object.Node;
+import com.gentics.contentnode.object.parttype.CMSResolver;
+import com.gentics.contentnode.render.RenderType;
+import com.gentics.contentnode.resolving.ResolvableMapWrapper;
+
+import groovy.lang.GroovyClassLoader;
+import groovy.lang.Script;
+
+/**
+ * Utilities for calling groovy scripts
+ */
+public final class GroovyUtils {
+	/**
+	 * Private constructor
+	 */
+	private GroovyUtils() {
+	}
+
+	/**
+	 * Load the class from the class loader and if it is a {@link Script}, create an instance, prepare it with the given handler and run it 
+	 * @param gcl groovy class loader
+	 * @param className class name
+	 * @param prepareScript consumer to prepare the script (add properties)
+	 * @return script return value
+	 * @throws NodeException
+	 */
+	public static Object call(GroovyClassLoader gcl, String className, Consumer<Script> prepareScript) throws NodeException {
+		try {
+			Class<?> scriptClass = gcl.loadClass(className);
+			if (Script.class.isAssignableFrom(scriptClass)) {
+				Script script = (Script) scriptClass.getDeclaredConstructor().newInstance();
+
+				if (prepareScript != null) {
+					prepareScript.accept(script);
+				}
+
+				return script.run();
+			} else {
+				throw new NodeException("%s is not a Script".formatted(className));
+			}
+		} catch (ClassNotFoundException e) {
+			throw new NodeException("Script %s not found".formatted(className));
+		} catch (NodeException e) {
+			throw e;
+		} catch (Exception e) {
+			throw new NodeException(e);
+		}
+	}
+
+	/**
+	 * Get the current compilation unit from the {@link RenderType}
+	 * @return current compilation unit
+	 * @throws NodeException
+	 */
+	public static CompilationUnit getCurrentCompilationUnit() throws NodeException {
+		RenderType renderType = TransactionManager.getCurrentTransaction().getRenderType();
+		CMSResolver cmsResolver = renderType.getCMSResolver();
+		Node node = ObjectTransformer.get(Node.class, cmsResolver.get("node")).getMaster();
+
+		return renderType.getCompilationUnit(node);
+	}
+
+	/**
+	 * Inject the current {@link CMSResolver} (wrapped into a {@link ResolvableMapWrapper}) into the script (as "cms")
+	 * @param script script to get the CMSResolver injected
+	 * @throws NodeException
+	 */
+	public static void injectCmsResolver(Script script) throws NodeException {
+		RenderType renderType = TransactionManager.getCurrentTransaction().getRenderType();
+		CMSResolver cmsResolver = renderType.getCMSResolver();
+		script.setProperty("cms", new ResolvableMapWrapper(cmsResolver));
+	}
+
+	/**
+	 * Find the groovy class with given name in the compilation unit
+	 * @param unit compilation unit to search
+	 * @param name name of the class to find
+	 * @return either the class or null, if not found
+	 */
+	public static GroovyClass findGroovyClass(CompilationUnit unit, String name) {
+		for (GroovyClass groovyClass : unit.getClasses()) {
+			if (Strings.CI.equals(groovyClass.getName(), name)) {
+				return groovyClass;
+			}
+		}
+		return null;
+	}
+}
diff --git a/cms-core/src/main/resources/changelog/content.CHANGELOG b/cms-core/src/main/resources/changelog/content.CHANGELOG
index a427d9dedb..19b63bc9f0 100644
--- a/cms-core/src/main/resources/changelog/content.CHANGELOG
+++ b/cms-core/src/main/resources/changelog/content.CHANGELOG
@@ -824,3 +824,4 @@
 2026-03-27  CH-1741 NOP SQL ALTER TABLE node ADD COLUMN default_form_folder_id INT NOT NULL default 0;
 2026-05-08  CH-1745 NOP SQL ALTER TABLE form ADD external_hash VARCHAR(255) after external_id; ## add column for external hash
 2026-05-21  CH-1747 NOP SQL CREATE TABLE form_translations (formtype VARCHAR(255) NOT NULL, translations MEDIUMTEXT NOT NULL, PRIMARY KEY (formtype)); ## Add table for form translations
+2026-08-06	CH-1750	NOP	SQL	INSERT INTO type (id, name, description, auto, javaclass) VALUES (45, 'Groovy', 'Execute Groovy Scripts', 0, 'com.gentics.contentnode.object.parttype.groovy.GroovyPartType'); ## Add new part type for executing Groovy scripts
diff --git a/cms-core/src/test/java/com/gentics/contentnode/tests/assertj/GCNAssertions.java b/cms-core/src/test/java/com/gentics/contentnode/tests/assertj/GCNAssertions.java
index 3be14fae64..462907cb2f 100644
--- a/cms-core/src/test/java/com/gentics/contentnode/tests/assertj/GCNAssertions.java
+++ b/cms-core/src/test/java/com/gentics/contentnode/tests/assertj/GCNAssertions.java
@@ -32,6 +32,7 @@
 import com.gentics.contentnode.object.Value;
 import com.gentics.contentnode.object.cr.CrFragment;
 import com.gentics.contentnode.object.scheduler.SchedulerSchedule;
+import com.gentics.contentnode.publish.PublishInfo;
 import com.gentics.contentnode.rest.model.FilePrivileges;
 import com.gentics.contentnode.rest.model.PagePrivileges;
 import com.gentics.contentnode.rest.model.RolePermissionsModel;
@@ -173,6 +174,10 @@ public static SchedulerScheduleAssert assertThat(SchedulerSchedule actual) {
 		return new SchedulerScheduleAssert(actual);
 	}
 
+	public static PublishInfoAssert assertThat(PublishInfo actual) {
+		return new PublishInfoAssert(actual);
+	}
+
 	/**
 	 * Create a {@link Condition} that checks whether an object has the given attribute set to the expected value.
 	 * The attribute is fetched via it's bean getter. The condition can be used with {@link AbstractAssert#has(Condition)}.
diff --git a/cms-core/src/test/java/com/gentics/contentnode/tests/assertj/PublishInfoAssert.java b/cms-core/src/test/java/com/gentics/contentnode/tests/assertj/PublishInfoAssert.java
new file mode 100644
index 0000000000..ccf85edac3
--- /dev/null
+++ b/cms-core/src/test/java/com/gentics/contentnode/tests/assertj/PublishInfoAssert.java
@@ -0,0 +1,52 @@
+package com.gentics.contentnode.tests.assertj;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.apache.commons.lang3.Strings;
+import org.assertj.core.api.AbstractAssert;
+
+import com.gentics.contentnode.publish.PublishInfo;
+
+/**
+ * Assert for {@link PublishInfo} instances
+ */
+public class PublishInfoAssert extends AbstractAssert<PublishInfoAssert, PublishInfo> {
+	/**
+	 * Create an instance
+	 * 
+	 * @param actual
+	 *            actual item
+	 */
+	protected PublishInfoAssert(PublishInfo actual) {
+		super(actual, PublishInfoAssert.class);
+	}
+
+	/**
+	 * Assert that the publish process succeeded
+	 * @return fluent API
+	 */
+	public PublishInfoAssert succeeded() {
+		assertThat(actual.getReturnCode()).as(descriptionText() + " Return code").isEqualTo(PublishInfo.RETURN_CODE_SUCCESS);
+		return this;
+	}
+
+	/**
+	 * Assert that the publish process failed
+	 * @return fluent API
+	 */
+	public PublishInfoAssert failed() {
+		assertThat(actual.getReturnCode()).as(descriptionText() + " Return code").isEqualTo(PublishInfo.RETURN_CODE_ERROR);
+		return this;
+	}
+
+	/**
+	 * Assert that the publish process contains a message containing the given text
+	 * @param text
+	 * @return fluent API
+	 */
+	public PublishInfoAssert containsMessage(String text) {
+		assertThat(actual.getMessages()).as(descriptionText() + " Messages")
+				.anyMatch(m -> Strings.CI.contains(m.getMessage(), text), "Message [%s]".formatted(text));
+		return this;
+	}
+}
diff --git a/cms-core/src/test/java/com/gentics/contentnode/tests/devtools/SubPackageContainerTest.java b/cms-core/src/test/java/com/gentics/contentnode/tests/devtools/SubPackageContainerTest.java
index 7d4e900836..0cb47a56c7 100644
--- a/cms-core/src/test/java/com/gentics/contentnode/tests/devtools/SubPackageContainerTest.java
+++ b/cms-core/src/test/java/com/gentics/contentnode/tests/devtools/SubPackageContainerTest.java
@@ -63,6 +63,7 @@ public class SubPackageContainerTest {
 		subPackageDirNames.put(PackageSynchronizer.TEMPLATES_DIR, false);
 		subPackageDirNames.put(PackageSynchronizer.FILES_DIR, false);
 		subPackageDirNames.put(PackageSynchronizer.HANDLEBARS_DIR, false);
+		subPackageDirNames.put(PackageSynchronizer.SCRIPTS_DIR, false);
 		subPackageDirNames.put("node_modules", true);
 		subPackageDirNames.put("subpackages", true);
 	}
diff --git a/cms-core/src/test/java/com/gentics/contentnode/tests/parttype/groovy/AbstractGroovyTest.java b/cms-core/src/test/java/com/gentics/contentnode/tests/parttype/groovy/AbstractGroovyTest.java
new file mode 100644
index 0000000000..113120018b
--- /dev/null
+++ b/cms-core/src/test/java/com/gentics/contentnode/tests/parttype/groovy/AbstractGroovyTest.java
@@ -0,0 +1,305 @@
+package com.gentics.contentnode.tests.parttype.groovy;
+
+import static com.gentics.contentnode.factory.Trx.operate;
+import static com.gentics.contentnode.tests.assertj.GCNAssertions.assertThat;
+import static com.gentics.contentnode.tests.utils.Builder.create;
+import static com.gentics.contentnode.tests.utils.ContentNodeTestDataUtils.getLanguage;
+import static com.gentics.contentnode.tests.utils.ContentNodeTestDataUtils.getPartTypeId;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.io.StringReader;
+import java.lang.reflect.Field;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.function.Function;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.tuple.Pair;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+
+import com.gentics.api.lib.etc.ObjectTransformer;
+import com.gentics.api.lib.exception.NodeException;
+import com.gentics.contentnode.devtools.MainPackageSynchronizer;
+import com.gentics.contentnode.object.Construct;
+import com.gentics.contentnode.object.ContentLanguage;
+import com.gentics.contentnode.object.Folder;
+import com.gentics.contentnode.object.Node;
+import com.gentics.contentnode.object.NodeObject;
+import com.gentics.contentnode.object.Page;
+import com.gentics.contentnode.object.Part;
+import com.gentics.contentnode.object.Template;
+import com.gentics.contentnode.object.TemplateTag;
+import com.gentics.contentnode.object.parttype.PageURLPartType;
+import com.gentics.contentnode.object.parttype.groovy.GroovyPartType;
+import com.gentics.contentnode.object.parttype.handlebars.HandlebarsPartType;
+import com.gentics.contentnode.testutils.DBTestContext;
+
+import groovy.lang.GroovyClassLoader;
+
+/**
+ * Abstract base class for groovy tests
+ */
+public abstract class AbstractGroovyTest {
+	protected final static String TESTPACKAGE_NAME = "testpackage";
+
+	protected final static String OTHERPACKAGE_NAME = "otherpackage";
+
+	protected static final String GROOVY_TAGNAME = "testtag";
+
+	protected static final String HBS_PART_NAME = "hbs";
+
+	protected static final String GROOVY_PART_NAME = "script";
+
+	protected static final String PAGE_PART_NAME = "page";
+
+	@ClassRule
+	public static DBTestContext testContext = new DBTestContext();
+
+	protected static Node node;
+
+	protected static Construct groovyConstruct;
+
+	protected static Template template;
+
+	protected static Folder homeFolder;
+
+	protected static Folder testFolder;
+
+	protected static Page testPage;
+
+	protected static Page targetPage;
+
+	@BeforeClass
+	public static void setupOnce() throws NodeException, IOException {
+		testContext.getContext().getTransaction().commit();
+
+		ContentLanguage german = getLanguage("de");
+		ContentLanguage english = getLanguage("en");
+
+		node = create(Node.class, n -> {
+			Folder root = create(Folder.class, f -> {
+				f.setName("Test Node");
+				f.setPublishDir("/");
+			}).doNotSave().build();
+			n.setFolder(root);
+			n.setHostname("test.node.hostname");
+			n.setPublishDir("/node/pub/dir");
+			n.setBinaryPublishDir("/node/pub/dir/bin");
+			n.getLanguages().add(german);
+			n.getLanguages().add(english);
+		}).build();
+
+		groovyConstruct = create(Construct.class, c -> {
+			c.setAutoEnable(true);
+			c.setKeyword("construct_with_groovy");
+			c.setName("Construct with Groovy", 1);
+
+			c.getParts().add(create(Part.class, p -> {
+				p.setPartTypeId(getPartTypeId(HandlebarsPartType.class));
+				p.setEditable(1);
+				p.setHidden(false);
+				p.setKeyname(HBS_PART_NAME);
+				p.setName("Handlebars", 1);
+			}).doNotSave().build());
+
+			c.getParts().add(create(Part.class, p -> {
+				p.setPartTypeId(getPartTypeId(GroovyPartType.class));
+				p.setEditable(1);
+				p.setHidden(true);
+				p.setKeyname(GROOVY_PART_NAME);
+				p.setName("Groovy", 1);
+			}).doNotSave().build());
+
+			c.getParts().add(create(Part.class, p -> {
+				p.setPartTypeId(getPartTypeId(PageURLPartType.class));
+				p.setEditable(1);
+				p.setHidden(true);
+				p.setKeyname(PAGE_PART_NAME);
+				p.setName("Page", 1);
+			}).doNotSave().build());
+		}).build();
+
+		template = create(Template.class, t -> {
+			t.setFolderId(node.getFolder().getId());
+			t.setMlId(1);
+			t.setName("Test Template");
+			t.setSource("<node testtag>");
+
+			t.getTemplateTags().put(GROOVY_TAGNAME, create(TemplateTag.class, tag -> {
+				tag.setConstructId(groovyConstruct.getId());
+				tag.setEnabled(true);
+				tag.setName(GROOVY_TAGNAME);
+				tag.setPublic(true);
+			}).doNotSave().build());
+		}).unlock().build();
+
+		homeFolder = create(Folder.class, f -> {
+			f.setMotherId(node.getFolder().getId());
+			f.setName("Home");
+			f.setPublishDir("/home");
+		}).build();
+
+		testFolder = create(Folder.class, f -> {
+			f.setMotherId(homeFolder.getId());
+			f.setName("Testfolder");
+			f.setPublishDir("/test");
+		}).build();
+
+		testPage = create(Page.class, p -> {
+			p.setFolder(node, testFolder);
+			p.setTemplateId(template.getId());
+			p.setName("Test Page");
+			p.setLanguage(german);
+		}).unlock().build();
+
+		targetPage = create(Page.class, p -> {
+			p.setFolder(node, testFolder);
+			p.setTemplateId(template.getId());
+			p.setName("Target Page");
+			p.setLanguage(english);
+		}).publish().unlock().build();
+	}
+
+	/**
+	 * Prepare the scripts by copying them into the package
+	 * @param synchronizer package synchronizer
+	 * @param scriptFileNames list of filenames
+	 * @throws IOException
+	 */
+	protected static void prepareScripts(MainPackageSynchronizer synchronizer, List<String> scriptFileNames) throws IOException {
+		String packageName = synchronizer.getName();
+		File packageRoot = synchronizer.getPackagePath().toFile();
+		File scriptsRoot = new File(packageRoot, "scripts");
+		if (!scriptsRoot.exists()) {
+			assertThat(scriptsRoot.mkdirs()).as("Creation of dirs " + scriptsRoot + " succeded").isTrue();
+		}
+
+		for (String name : scriptFileNames) {
+			try (InputStream in = GroovyRenderingTest.class.getResourceAsStream("%s/%s".formatted(packageName, name));
+					OutputStream out = new FileOutputStream(new File(scriptsRoot, name))) {
+				if (in != null) {
+					IOUtils.copy(in, out);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Modify the content of the script file in the given package
+	 * @param synchronizer package synchronizer
+	 * @param scriptFileName name of the script file
+	 * @param modifier modified function
+	 * @throws IOException
+	 */
+	protected static void modifyScript(MainPackageSynchronizer synchronizer, String scriptFileName,
+			Function<String, String> modifier) throws IOException {
+		File packageRoot = synchronizer.getPackagePath().toFile();
+		File scriptsRoot = new File(packageRoot, "scripts");
+
+		String original;
+		try (InputStream in = new FileInputStream(new File(scriptsRoot, scriptFileName));
+				ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+			IOUtils.copy(in, out);
+			original = out.toString(StandardCharsets.UTF_8);
+		}
+
+		String modified = modifier.apply(original);
+
+		assertThat(modified).as("Modified script content").isNotEqualTo(original);
+
+		try (Reader in = new StringReader(modified);
+				OutputStream out = new FileOutputStream(new File(scriptsRoot, scriptFileName))) {
+			IOUtils.copy(in, out, StandardCharsets.UTF_8);
+		}
+	}
+
+	/**
+	 * Read the file with given name. This will fail, when the file does not exist
+	 * @param fileName file name
+	 * @return file content
+	 * @throws IOException
+	 */
+	protected String readFile(String fileName) throws IOException {
+		ByteArrayOutputStream out = new ByteArrayOutputStream();
+		try (InputStream in = getClass().getResourceAsStream(fileName)) {
+			IOUtils.copy(in, out);
+		}
+		return out.toString(StandardCharsets.UTF_8);
+	}
+
+	/**
+	 * Read the file with given name. When the file does not exist, return the default content
+	 * @param fileName file name
+	 * @param defaultContent default content
+	 * @return file or default content
+	 * @throws IOException
+	 */
+	protected String readFile(String fileName, String defaultContent) throws IOException {
+		ByteArrayOutputStream out = new ByteArrayOutputStream();
+		try (InputStream in = getClass().getResourceAsStream(fileName)) {
+			if (in == null) {
+				return defaultContent;
+			}
+			IOUtils.copy(in, out);
+		}
+		return out.toString(StandardCharsets.UTF_8);
+	}
+
+	/**
+	 * Assert that the rendered testPage has the expected dependencies
+	 * @param expectedDependencies expected dependencies
+	 * @throws NodeException
+	 */
+	protected void assertDependencies(List<Pair<String, String>> expectedDependencies) throws NodeException {
+		if (CollectionUtils.isNotEmpty(expectedDependencies)) {
+			operate(() -> {
+				for (Pair<String, String> dep : expectedDependencies) {
+					// the left part denotes the field name of the test class containing the object from which the test page depends
+					String fieldName = dep.getLeft();
+					// the right part denotes the property
+					String property = dep.getRight();
+					try {
+						Field field = AbstractGroovyTest.class.getDeclaredField(fieldName);
+						NodeObject nodeObject = ObjectTransformer.get(NodeObject.class, field.get(null));
+						assertThat(testPage).dependsOn(nodeObject, property, 0);
+					} catch (Exception e) {
+						throw new NodeException(e);
+					}
+				}
+			});
+		}
+	}
+
+	/**
+	 * Assert existence/nonexistence of a class in the class loader by loading it
+	 * @param gcl class loader
+	 * @param name class name (fully qualified)
+	 * @param expectExistence true to expect existence
+	 * @return the class if it exists or null
+	 */
+	protected Class<?> assertClass(GroovyClassLoader gcl, String name, boolean expectExistence) {
+		try {
+			Class<?> clazz = gcl.loadClass(name);
+			if (!expectExistence) {
+				fail("Unexpectedly loaded class %s".formatted(name));
+			}
+			return clazz;
+		} catch (ClassNotFoundException e) {
+			if (expectExistence) {
+				fail("Could not find class %s".formatted(name));
+			}
+		}
+		return null;
+	}
+}
diff --git a/cms-core/src/test/java/com/gentics/contentnode/tests/parttype/groovy/GroovyPackageScriptTest.java b/cms-core/src/test/java/com/gentics/contentnode/tests/parttype/groovy/GroovyPackageScriptTest.java
new file mode 100644
index 0000000000..1a2e52f5f9
--- /dev/null
+++ b/cms-core/src/test/java/com/gentics/contentnode/tests/parttype/groovy/GroovyPackageScriptTest.java
@@ -0,0 +1,150 @@
+package com.gentics.contentnode.tests.parttype.groovy;
+
+import static com.gentics.contentnode.factory.Trx.operate;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import com.gentics.api.lib.etc.ObjectTransformer;
+import com.gentics.api.lib.exception.NodeException;
+import com.gentics.contentnode.devtools.Synchronizer;
+import com.gentics.contentnode.factory.RenderTypeTrx;
+import com.gentics.contentnode.factory.Trx;
+import com.gentics.contentnode.tests.devtools.PackageSynchronizerContext;
+import com.gentics.contentnode.utils.GroovyUtils;
+
+import groovy.lang.GroovyClassLoader;
+
+/**
+ * Test cases for availability of scripts from devtool packages
+ */
+public class GroovyPackageScriptTest extends AbstractGroovyTest {
+	public final static String EXPECTED_ORIGINAL_SCRIPT_RESULT = "This is the script from testpackage called with param [%s]";
+
+	public final static String EXPECTED_MODIFIED_SCRIPT_RESULT = "This is the modified script from testpackage called with param [%s]";
+
+	/**
+	 * Name of the script file
+	 */
+	public final static String SCRIPTFILE_NAME = "script.groovy";
+
+	/**
+	 * Fully qualified name of the class (compiled from the script file)
+	 */
+	public final static String CLASS_NAME = "testpackage.script";
+
+	@Rule
+	public PackageSynchronizerContext syncContext = new PackageSynchronizerContext();
+
+	@Before
+	public void setup() throws NodeException {
+		Synchronizer.addPackage(TESTPACKAGE_NAME);
+	}
+
+	/**
+	 * Test that adding a package to a node makes the scripts of the packages available in the {@link GroovyClassLoader}
+	 * @throws NodeException
+	 * @throws IOException
+	 */
+	@Test
+	public void testAddPackageToNode() throws NodeException, IOException {
+		prepareScripts(Synchronizer.getPackage(TESTPACKAGE_NAME), List.of(SCRIPTFILE_NAME));
+
+		try (Trx trx = new Trx(); RenderTypeTrx rTrx = RenderTypeTrx.publish(true)) {
+			GroovyClassLoader gcl = rTrx.get().getCompilationUnit(node).getClassLoader();
+
+			assertClass(gcl, CLASS_NAME, false);
+		}
+
+		operate(() -> Synchronizer.addPackage(node, TESTPACKAGE_NAME));
+
+		try (Trx trx = new Trx(); RenderTypeTrx rTrx = RenderTypeTrx.publish(true)) {
+			GroovyClassLoader gcl = rTrx.get().getCompilationUnit(node).getClassLoader();
+			assertClass(gcl, CLASS_NAME, true);
+		}
+	}
+
+	/**
+	 * Test that removing a package from a node removes the scripts of the package from the {@link GroovyClassLoader}
+	 * @throws NodeException
+	 * @throws IOException
+	 */
+	@Test
+	public void testRemovePackageFromNode() throws NodeException, IOException {
+		prepareScripts(Synchronizer.getPackage(TESTPACKAGE_NAME), List.of(SCRIPTFILE_NAME));
+		operate(() -> Synchronizer.addPackage(node, TESTPACKAGE_NAME));
+
+		try (Trx trx = new Trx(); RenderTypeTrx rTrx = RenderTypeTrx.publish(true)) {
+			GroovyClassLoader gcl = rTrx.get().getCompilationUnit(node).getClassLoader();
+			assertClass(gcl, CLASS_NAME, true);
+		}
+
+		operate(() -> Synchronizer.removePackage(node, TESTPACKAGE_NAME));
+
+		try (Trx trx = new Trx(); RenderTypeTrx rTrx = RenderTypeTrx.publish(true)) {
+			GroovyClassLoader gcl = rTrx.get().getCompilationUnit(node).getClassLoader();
+			assertClass(gcl, CLASS_NAME, false);
+		}
+	}
+
+	/**
+	 * Test that changing the contents of a script gets the script re-compiled
+	 * @throws NodeException
+	 * @throws IOException
+	 */
+	@Test
+	public void testChangeScriptInPackage() throws NodeException, IOException {
+		prepareScripts(Synchronizer.getPackage(TESTPACKAGE_NAME), List.of(SCRIPTFILE_NAME));
+		operate(() -> Synchronizer.addPackage(node, TESTPACKAGE_NAME));
+		Class<?> originalClass;
+
+		// load the class and execute the script
+		try (Trx trx = new Trx(); RenderTypeTrx rTrx = RenderTypeTrx.publish(true)) {
+			GroovyClassLoader gcl = rTrx.get().getCompilationUnit(node).getClassLoader();
+			originalClass = assertClass(gcl, CLASS_NAME, true);
+
+			String result = ObjectTransformer.getString(GroovyUtils.call(gcl, CLASS_NAME, script -> {
+				script.setProperty("param", "call #1");
+			}), null);
+
+			assertThat(result).as("Script result").isEqualTo(EXPECTED_ORIGINAL_SCRIPT_RESULT.formatted("call #1"));
+		}
+
+		// load the class again (should be the same) and execute the script again
+		try (Trx trx = new Trx(); RenderTypeTrx rTrx = RenderTypeTrx.publish(true)) {
+			GroovyClassLoader gcl = rTrx.get().getCompilationUnit(node).getClassLoader();
+			Class<?> scriptClass = assertClass(gcl, CLASS_NAME, true);
+
+			assertThat(scriptClass).as("Script class").isEqualTo(originalClass);
+
+			String result = ObjectTransformer.getString(GroovyUtils.call(gcl, CLASS_NAME, script -> {
+				script.setProperty("param", "call #2");
+			}), null);
+
+			assertThat(result).as("Script result").isEqualTo(EXPECTED_ORIGINAL_SCRIPT_RESULT.formatted("call #2"));
+		}
+
+		modifyScript(Synchronizer.getPackage(TESTPACKAGE_NAME), SCRIPTFILE_NAME, content -> {
+			return content.replace("This is the script", "This is the modified script");
+		});
+
+		// load the class again (should be different) and execute the script again
+		try (Trx trx = new Trx(); RenderTypeTrx rTrx = RenderTypeTrx.publish(true)) {
+			GroovyClassLoader gcl = rTrx.get().getCompilationUnit(node).getClassLoader();
+			Class<?> scriptClass = assertClass(gcl, CLASS_NAME, true);
+
+			assertThat(scriptClass).as("Script class").isNotEqualTo(originalClass);
+
+			String result = ObjectTransformer.getString(GroovyUtils.call(gcl, CLASS_NAME, script -> {
+				script.setProperty("param", "call #3");
+			}), null);
+
+			assertThat(result).as("Script result").isEqualTo(EXPECTED_MODIFIED_SCRIPT_RESULT.formatted("call #3"));
+		}
+	}
+}
diff --git a/cms-core/src/test/java/com/gentics/contentnode/tests/parttype/groovy/GroovyPartTypeResolvingTest.java b/cms-core/src/test/java/com/gentics/contentnode/tests/parttype/groovy/GroovyPartTypeResolvingTest.java
new file mode 100644
index 0000000000..1880ad3b37
--- /dev/null
+++ b/cms-core/src/test/java/com/gentics/contentnode/tests/parttype/groovy/GroovyPartTypeResolvingTest.java
@@ -0,0 +1,249 @@
+package com.gentics.contentnode.tests.parttype.groovy;
+
+import static com.gentics.contentnode.factory.Trx.consume;
+import static com.gentics.contentnode.tests.parttype.groovy.AbstractGroovyTest.GROOVY_PART_NAME;
+import static com.gentics.contentnode.tests.parttype.groovy.AbstractGroovyTest.GROOVY_TAGNAME;
+import static com.gentics.contentnode.tests.parttype.groovy.AbstractGroovyTest.HBS_PART_NAME;
+import static com.gentics.contentnode.tests.utils.Builder.create;
+import static com.gentics.contentnode.tests.utils.Builder.update;
+import static com.gentics.contentnode.tests.utils.ContentNodeTestDataUtils.getPartType;
+import static com.gentics.contentnode.tests.utils.ContentNodeTestDataUtils.getPartTypeId;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
+
+import com.gentics.api.lib.exception.NodeException;
+import com.gentics.contentnode.factory.RenderTypeTrx;
+import com.gentics.contentnode.factory.Trx;
+import com.gentics.contentnode.object.Construct;
+import com.gentics.contentnode.object.Folder;
+import com.gentics.contentnode.object.Node;
+import com.gentics.contentnode.object.Page;
+import com.gentics.contentnode.object.Part;
+import com.gentics.contentnode.object.Template;
+import com.gentics.contentnode.object.TemplateTag;
+import com.gentics.contentnode.object.Value;
+import com.gentics.contentnode.object.parttype.ChangeableListPartType;
+import com.gentics.contentnode.object.parttype.CheckboxPartType;
+import com.gentics.contentnode.object.parttype.CmsFormPartType;
+import com.gentics.contentnode.object.parttype.DatasourcePartType;
+import com.gentics.contentnode.object.parttype.FileURLPartType;
+import com.gentics.contentnode.object.parttype.FolderURLPartType;
+import com.gentics.contentnode.object.parttype.HTMLPartType;
+import com.gentics.contentnode.object.parttype.HTMLTextPartType;
+import com.gentics.contentnode.object.parttype.ImageURLPartType;
+import com.gentics.contentnode.object.parttype.LongHTMLPartType;
+import com.gentics.contentnode.object.parttype.LongHTMLTextPartType;
+import com.gentics.contentnode.object.parttype.MultiSelectPartType;
+import com.gentics.contentnode.object.parttype.NodePartType;
+import com.gentics.contentnode.object.parttype.NormalTextPartType;
+import com.gentics.contentnode.object.parttype.OrderedListPartType;
+import com.gentics.contentnode.object.parttype.OverviewPartType;
+import com.gentics.contentnode.object.parttype.PageTagPartType;
+import com.gentics.contentnode.object.parttype.PageURLPartType;
+import com.gentics.contentnode.object.parttype.PartType;
+import com.gentics.contentnode.object.parttype.ShortTextPartType;
+import com.gentics.contentnode.object.parttype.SingleSelectPartType;
+import com.gentics.contentnode.object.parttype.TemplateTagPartType;
+import com.gentics.contentnode.object.parttype.UnorderedListPartType;
+import com.gentics.contentnode.object.parttype.groovy.GroovyPartType;
+import com.gentics.contentnode.object.parttype.handlebars.HandlebarsPartType;
+import com.gentics.contentnode.testutils.DBTestContext;
+
+/**
+ * Test cases for resolving attributes of other part types
+ */
+@RunWith(value = Parameterized.class)
+public class GroovyPartTypeResolvingTest {
+	@ClassRule
+	public static DBTestContext testContext = new DBTestContext();
+
+	private static Node node;
+
+	@Parameters(name = "{index}: template {0}")
+	public static Collection<Object[]> data() {
+		Collection<Object[]> data = Arrays.asList(
+			new Object[] { CheckboxPartType.class, "checked" },
+			new Object[] { CmsFormPartType.class, "target" },
+			new Object[] { DatasourcePartType.class, "items, key, keys, selection, value, values" },
+			new Object[] { MultiSelectPartType.class, "items, key, keys, selection, value, values" },
+			new Object[] { SingleSelectPartType.class, "items, key, keys, selection, value, values" },
+			new Object[] { ChangeableListPartType.class, "count, lines, ordered" },
+			new Object[] { OrderedListPartType.class, "count, lines" },
+			new Object[] { UnorderedListPartType.class, "count, lines" },
+			new Object[] { NodePartType.class, "id, name" },
+			new Object[] { OverviewPartType.class, "count, items, listType, maxItems, orderBy, orderDirection, recursive, selectType" },
+			new Object[] { PageTagPartType.class, "container, id, page_id, tag" },
+			new Object[] { TemplateTagPartType.class, "container, id, page_id, tag" },
+			new Object[] { HTMLPartType.class, "text" },
+			new Object[] { HTMLTextPartType.class, "text" },
+			new Object[] { LongHTMLPartType.class, "text" },
+			new Object[] { LongHTMLTextPartType.class, "text" },
+			new Object[] { NormalTextPartType.class, "text" },
+			new Object[] { ShortTextPartType.class, "text" },
+			new Object[] { FileURLPartType.class , "externalurl, internal, node, nodeId, target, url" },
+			new Object[] { FolderURLPartType.class, "externalurl, internal, node, nodeId, target, url" },
+			new Object[] { ImageURLPartType.class, "externalurl, internal, node, nodeId, target, url"},
+			new Object[] { PageURLPartType.class, "externalurl, internal, node, nodeId, target, url" }
+		);
+		return data;
+	}
+
+	@BeforeClass
+	public static void setupOnce() throws NodeException {
+		testContext.getContext().getTransaction().commit();
+
+		node = create(Node.class, n -> {
+			Folder root = create(Folder.class, f -> {
+				f.setName("Test Node");
+				f.setPublishDir("/");
+			}).doNotSave().build();
+			n.setFolder(root);
+			n.setHostname("test.node.hostname");
+			n.setPublishDir("/");
+			n.setBinaryPublishDir("/");
+		}).build();
+	}
+
+	@Parameter(0)
+	public Class<? extends PartType> testedClass;
+
+	@Parameter(1)
+	public String expectedResolvableKeys;
+
+	protected Construct construct;
+
+	protected Template template;
+
+	protected Page page;
+
+	@Before
+	public void setup() throws NodeException {
+		construct = create(Construct.class, c -> {
+			c.setAutoEnable(true);
+			c.setKeyword("construct");
+			c.setName("construct", 1);
+
+			c.getParts().add(create(Part.class, p -> {
+				p.setPartTypeId(getPartTypeId(GroovyPartType.class));
+				p.setEditable(0);
+				p.setHidden(true);
+				p.setKeyname(GROOVY_PART_NAME);
+				p.setName("Groovy", 1);
+				p.setDefaultValue(create(Value.class, v -> {}).doNotSave().build());
+			}).doNotSave().build());
+
+			c.getParts().add(create(Part.class, p -> {
+				p.setPartTypeId(getPartTypeId(HandlebarsPartType.class));
+				p.setEditable(0);
+				p.setHidden(false);
+				p.setKeyname(HBS_PART_NAME);
+				p.setName("Handlebars", 1);
+				p.setDefaultValue(create(Value.class, v -> {}).doNotSave().build());
+			}).doNotSave().build());
+
+			c.getParts().add(create(Part.class, p -> {
+				p.setPartTypeId(getPartTypeId(testedClass));
+				p.setEditable(0);
+				p.setHidden(true);
+				p.setKeyname("otherpart");
+				p.setName("Other Part", 1);
+				p.setDefaultValue(create(Value.class, v -> {}).doNotSave().build());
+			}).doNotSave().build());
+		}).build();
+
+		construct = update(construct, c -> {
+			getPartType(HandlebarsPartType.class, c, HBS_PART_NAME).setText("{{ cms.tag.parts.%s.execute }}".formatted(GROOVY_PART_NAME));
+			getPartType(GroovyPartType.class, c, GROOVY_PART_NAME).setText("return cms.tag.parts.otherpart.keySet().join(\", \")");
+		}).build();
+
+		template = create(Template.class, t -> {
+			t.setFolderId(node.getFolder().getId());
+			t.setMlId(1);
+			t.setName("Template");
+			t.setSource(String.format("<node %s>", GROOVY_TAGNAME));
+
+			t.getTemplateTags().put(GROOVY_TAGNAME, create(TemplateTag.class, tag -> {
+				tag.setConstructId(construct.getId());
+				tag.setEnabled(true);
+				tag.setName(GROOVY_TAGNAME);
+				tag.setPublic(false);
+			}).doNotSave().build());
+		}).unlock().build();
+
+		page = create(Page.class, p -> {
+			p.setFolder(node, node.getFolder());
+			p.setTemplateId(template.getId());
+			p.setName("Page");
+		}).unlock().build();
+	}
+
+	@After
+	public void teardown() throws NodeException {
+		if (page != null) {
+			consume(p -> p.delete(true), page);
+			page = null;
+		}
+
+		if (template != null) {
+			consume(t -> t.delete(true), template);
+			template = null;
+		}
+
+		if (construct != null) {
+			consume(c -> c.delete(true), construct);
+			construct = null;
+		}
+	}
+
+	/**
+	 * Test rendering the page (which renders the tag)
+	 * @throws NodeException
+	 */
+	@Test
+	public void testRenderPage() throws NodeException {
+		try (Trx trx = new Trx(); RenderTypeTrx rTrx = RenderTypeTrx.publish()) {
+			assertThat(page.render()).as("Rendered page").isEqualTo(expectedResolvableKeys);
+			trx.success();
+		}
+	}
+
+	/**
+	 * Test rendering the handlebars part directly
+	 * @throws NodeException
+	 */
+	@Test
+	public void testRenderHandlebarsPart() throws NodeException {
+		try (Trx trx = new Trx(); RenderTypeTrx rTrx = RenderTypeTrx.publish()) {
+			assertThat(page.render("<node %s.parts.%s>".formatted(GROOVY_TAGNAME, HBS_PART_NAME),
+					trx.getTransaction().getRenderResult(), null, null, null, null)).as("Rendered page")
+					.isEqualTo(expectedResolvableKeys);
+			trx.success();
+		}
+	}
+
+	/**
+	 * Test executing the groovy part directly
+	 * @throws NodeException
+	 */
+	@Test
+	public void testExecuteGroovyPart() throws NodeException {
+		try (Trx trx = new Trx(); RenderTypeTrx rTrx = RenderTypeTrx.publish()) {
+			assertThat(page.render("<node %s.parts.%s.execute>".formatted(GROOVY_TAGNAME, GROOVY_PART_NAME),
+					trx.getTransaction().getRenderResult(), null, null, null, null)).as("Rendered page")
+					.isEqualTo(expectedResolvableKeys);
+			trx.success();
+		}
+	}
+}
diff --git a/cms-core/src/test/java/com/gentics/contentnode/tests/parttype/groovy/GroovyPublishingTest.java b/cms-core/src/test/java/com/gentics/contentnode/tests/parttype/groovy/GroovyPublishingTest.java
new file mode 100644
index 0000000000..1598e6e827
--- /dev/null
+++ b/cms-core/src/test/java/com/gentics/contentnode/tests/parttype/groovy/GroovyPublishingTest.java
@@ -0,0 +1,123 @@
+package com.gentics.contentnode.tests.parttype.groovy;
+
+import static com.gentics.contentnode.factory.Trx.operate;
+import static com.gentics.contentnode.tests.assertj.GCNAssertions.assertThat;
+import static com.gentics.contentnode.tests.utils.Builder.update;
+import static com.gentics.contentnode.tests.utils.ContentNodeTestDataUtils.getPartType;
+
+import java.io.IOException;
+import java.util.List;
+
+import org.apache.commons.lang3.Strings;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+
+import com.gentics.api.lib.exception.NodeException;
+import com.gentics.contentnode.devtools.Synchronizer;
+import com.gentics.contentnode.factory.Trx;
+import com.gentics.contentnode.i18n.I18NHelper;
+import com.gentics.contentnode.object.ContentTag;
+import com.gentics.contentnode.object.parttype.PageURLPartType;
+import com.gentics.contentnode.object.parttype.groovy.GroovyPartType;
+import com.gentics.contentnode.object.parttype.handlebars.HandlebarsPartType;
+import com.gentics.contentnode.publish.PublishInfo;
+import com.gentics.contentnode.tests.devtools.PackageSynchronizerContext;
+
+/**
+ * Test publishing with groovy scripts
+ */
+public class GroovyPublishingTest extends AbstractGroovyTest {
+	@ClassRule
+	public static PackageSynchronizerContext syncContext = new PackageSynchronizerContext();
+
+	protected static String VALID_CODE = "import groovy.transform.Field";
+
+	protected static String BROKEN_CODE = "import bli.bla.blubb";
+
+	@BeforeClass
+	public static void setupOnce() throws NodeException, IOException {
+		AbstractGroovyTest.setupOnce();
+
+		Synchronizer.addPackage(TESTPACKAGE_NAME);
+		Synchronizer.addPackage(OTHERPACKAGE_NAME);
+		operate(() -> Synchronizer.addPackage(node, TESTPACKAGE_NAME));
+
+		node = update(node, upd -> {
+			upd.setPublishFilesystem(true);
+		}).build();
+
+		testPage = update(testPage, p -> {
+			ContentTag contentTag = p.getContentTag(GROOVY_TAGNAME);
+
+			getPartType(HandlebarsPartType.class, contentTag, HBS_PART_NAME).setText("{{gtx_script \"%s.%s\"}}".formatted(TESTPACKAGE_NAME, "script"));
+			getPartType(GroovyPartType.class, contentTag, GROOVY_PART_NAME).setText("");
+			getPartType(PageURLPartType.class, contentTag, PAGE_PART_NAME).setTargetPage(targetPage);
+		}).unlock().build();
+	}
+
+	@Before
+	public void setup() throws IOException, NodeException {
+		prepareScripts(Synchronizer.getPackage(TESTPACKAGE_NAME), List.of("script.groovy"));
+		prepareScripts(Synchronizer.getPackage(OTHERPACKAGE_NAME), List.of("script.groovy"));
+
+		testPage = update(testPage, p -> {
+		}).publish().unlock().build();
+	}
+
+	/**
+	 * Test that compile errors in a package assigned to a node lets the publish process fail
+	 * @throws Exception
+	 */
+	@Test
+	public void testCompileError() throws Exception {
+		// modify the script so it does not compile any more
+		modifyScript(Synchronizer.getPackage(TESTPACKAGE_NAME), "script.groovy", content -> {
+			return Strings.CI.replace(content, VALID_CODE, BROKEN_CODE);
+		});
+
+		// publish process must fail now
+		try (Trx trx = new Trx()) {
+			PublishInfo publishInfo = testContext.getContext().publish(false);
+
+			assertThat(publishInfo).as("Publish process").failed()
+					.containsMessage("Error while compiling scripts for %s".formatted(I18NHelper.getName(node)))
+					.containsMessage("import bli.bla.blubb");
+			trx.success();
+		}
+
+		// fix the script
+		modifyScript(Synchronizer.getPackage(TESTPACKAGE_NAME), "script.groovy", content -> {
+			return Strings.CI.replace(content, BROKEN_CODE, VALID_CODE);
+		});
+
+		// publish process must succeed now
+		try (Trx trx = new Trx()) {
+			PublishInfo publishInfo = testContext.getContext().publish(false);
+
+			assertThat(publishInfo).as("Publish process").succeeded();
+			trx.success();
+		}
+	}
+
+	/**
+	 * Test that compile errors in a foreign package do not let the publish process fail
+	 * @throws Exception
+	 */
+	@Test
+	public void testCompileErrorInForeignPackage() throws Exception {
+		// modify the script so it does not compile any more
+		modifyScript(Synchronizer.getPackage(OTHERPACKAGE_NAME), "script.groovy", content -> {
+			return Strings.CI.replace(content, VALID_CODE, BROKEN_CODE);
+		});
+
+		// publish process must still succeed
+		try (Trx trx = new Trx()) {
+			PublishInfo publishInfo = testContext.getContext().publish(false);
+
+			assertThat(publishInfo).as("Publish process").succeeded();
+			trx.success();
+		}
+	}
+}
diff --git a/cms-core/src/test/java/com/gentics/contentnode/tests/parttype/groovy/GroovyRenderingTest.java b/cms-core/src/test/java/com/gentics/contentnode/tests/parttype/groovy/GroovyRenderingTest.java
new file mode 100644
index 0000000000..6f5baa6a70
--- /dev/null
+++ b/cms-core/src/test/java/com/gentics/contentnode/tests/parttype/groovy/GroovyRenderingTest.java
@@ -0,0 +1,112 @@
+package com.gentics.contentnode.tests.parttype.groovy;
+
+import static com.gentics.contentnode.factory.Trx.operate;
+import static com.gentics.contentnode.tests.utils.Builder.update;
+import static com.gentics.contentnode.tests.utils.ContentNodeTestDataUtils.getPartType;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.Pair;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
+
+import com.gentics.api.lib.exception.NodeException;
+import com.gentics.contentnode.devtools.Synchronizer;
+import com.gentics.contentnode.factory.RenderTypeTrx;
+import com.gentics.contentnode.factory.Trx;
+import com.gentics.contentnode.object.ContentTag;
+import com.gentics.contentnode.object.parttype.PageURLPartType;
+import com.gentics.contentnode.object.parttype.groovy.GroovyPartType;
+import com.gentics.contentnode.object.parttype.handlebars.HandlebarsPartType;
+import com.gentics.contentnode.tests.devtools.PackageSynchronizerContext;
+
+/**
+ * Test cases for rendering groovy scripts
+ */
+@RunWith(value = Parameterized.class)
+public class GroovyRenderingTest extends AbstractGroovyTest {
+	protected final static List<String> TESTPACKAGE_SCRIPTS = List.of("class1.groovy", "class2.groovy", "script.groovy", "foldername.groovy");
+
+	protected final static List<String> OTHERPACKAGE_SCRIPTS = List.of("class1.groovy", "class2.groovy", "script.groovy");
+
+	@ClassRule
+	public static PackageSynchronizerContext syncContext = new PackageSynchronizerContext();
+
+	@BeforeClass
+	public static void setupOnce() throws NodeException, IOException {
+		AbstractGroovyTest.setupOnce();
+
+		Synchronizer.addPackage(TESTPACKAGE_NAME);
+		Synchronizer.addPackage(OTHERPACKAGE_NAME);
+
+		operate(() -> Synchronizer.addPackage(node, TESTPACKAGE_NAME));
+		operate(() -> Synchronizer.addPackage(node, OTHERPACKAGE_NAME));
+
+		prepareScripts(Synchronizer.getPackage(TESTPACKAGE_NAME), TESTPACKAGE_SCRIPTS);
+		prepareScripts(Synchronizer.getPackage(OTHERPACKAGE_NAME), OTHERPACKAGE_SCRIPTS);
+	}
+
+	@Parameters(name = "{index}: {0}")
+	public static Collection<Object[]> data() {
+		Collection<Object[]> data = new ArrayList<>();
+		for (String script : List.of("simple", "foldername", "import_class1", "import_class2", "direct_script",
+				"direct_script_with_param", "load_page_script", "load_page_class", "foldername_script")) {
+			data.add(new Object[] { script });
+		}
+		return data;
+	}
+
+	@Parameter(0)
+	public String testCase;
+
+	protected String expectedResult;
+
+	protected List<Pair<String, String>> expectedDependencies = new ArrayList<>();
+
+	@Before
+	public void setup() throws NodeException, IOException {
+		String scriptContent = readFile("%s.groovy".formatted(testCase), "");
+		String hbsTemplate = readFile("%s.hbs".formatted(testCase), "{{cms.tag.parts.script.execute}}");
+		expectedResult = readFile("%s.result".formatted(testCase), "");
+
+		String dependencies = readFile("%s.dependencies".formatted(testCase), "");
+		if (StringUtils.isNotBlank(dependencies)) {
+			for (String line : IOUtils.readLines(dependencies)) {
+				String[] parts = StringUtils.split(line, ':');
+				if (parts.length == 2) {
+					expectedDependencies.add(Pair.of(parts[0], parts[1]));
+				}
+			}
+		}
+
+		testPage = update(testPage, p -> {
+			ContentTag contentTag = p.getContentTag(GROOVY_TAGNAME);
+
+			getPartType(HandlebarsPartType.class, contentTag, HBS_PART_NAME).setText(hbsTemplate);
+			getPartType(GroovyPartType.class, contentTag, GROOVY_PART_NAME).setText(scriptContent);
+			getPartType(PageURLPartType.class, contentTag, PAGE_PART_NAME).setTargetPage(targetPage);
+		}).publish().unlock().build();
+	}
+
+	@Test
+	public void testRender() throws NodeException {
+		try (Trx trx = new Trx(); RenderTypeTrx rTrx = RenderTypeTrx.publish(true)) {
+			assertThat(testPage.render()).as("Rendered page").isEqualTo(expectedResult);
+			trx.success();
+		}
+
+		assertDependencies(expectedDependencies);
+	}
+}
diff --git a/cms-core/src/test/java/com/gentics/contentnode/tests/parttype/groovy/MeshRolesWithGroovyPartTypeTest.java b/cms-core/src/test/java/com/gentics/contentnode/tests/parttype/groovy/MeshRolesWithGroovyPartTypeTest.java
new file mode 100644
index 0000000000..e1f929ab3e
--- /dev/null
+++ b/cms-core/src/test/java/com/gentics/contentnode/tests/parttype/groovy/MeshRolesWithGroovyPartTypeTest.java
@@ -0,0 +1,115 @@
+package com.gentics.contentnode.tests.parttype.groovy;
+
+import static com.gentics.contentnode.factory.Trx.supply;
+import static com.gentics.contentnode.tests.utils.Builder.create;
+import static com.gentics.contentnode.tests.utils.Builder.update;
+import static com.gentics.contentnode.tests.utils.ContentNodeTestDataUtils.createDatasource;
+import static com.gentics.contentnode.tests.utils.ContentNodeTestDataUtils.getPartType;
+import static com.gentics.contentnode.tests.utils.ContentNodeTestDataUtils.getPartTypeId;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
+
+import com.gentics.api.lib.etc.ObjectTransformer;
+import com.gentics.api.lib.exception.NodeException;
+import com.gentics.contentnode.factory.RenderTypeTrx;
+import com.gentics.contentnode.factory.Transaction;
+import com.gentics.contentnode.factory.Trx;
+import com.gentics.contentnode.object.ContentTag;
+import com.gentics.contentnode.object.Datasource;
+import com.gentics.contentnode.object.Page;
+import com.gentics.contentnode.object.Part;
+import com.gentics.contentnode.object.parttype.MultiSelectPartType;
+import com.gentics.contentnode.object.parttype.groovy.GroovyPartType;
+import com.gentics.contentnode.publish.cr.MeshRoleRenderer;
+
+/**
+ * Specific test cases for usage of groovy scripts to calculate Mesh roles
+ */
+@RunWith(Parameterized.class)
+public class MeshRolesWithGroovyPartTypeTest extends AbstractGroovyTest {
+	public final static String SELECT_PART_NAME = "select";
+
+	protected static Datasource rolesDatasource;
+
+	@Parameters(name = "{index}: {0}")
+	public static Collection<Object[]> data() {
+		return List.of(
+				new Object[] { "literal", "def roles = [\"role_a\", \"role_b\", \"role_c\"]\nreturn roles",
+						new String[] { "role_a", "role_b", "role_c" } },
+				new Object[] { "resolved from tag", "return cms.tag.parts.keySet()",
+						new String[] { GROOVY_PART_NAME, HBS_PART_NAME, PAGE_PART_NAME, SELECT_PART_NAME,
+								"unique_tag_id" } },
+				new Object[] { "resolved from select part",
+						"return cms.tag.parts.%s.selection.key".formatted(SELECT_PART_NAME), new String[] { "role_1", "role_3" } });
+	}
+
+	@BeforeClass
+	public static void setupOnce() throws NodeException, IOException {
+		AbstractGroovyTest.setupOnce();
+
+		rolesDatasource = supply(() -> createDatasource("roles", List.of("role_1", "role_2", "role_3")));
+
+		groovyConstruct = update(groovyConstruct, c -> {
+			c.getParts().add(create(Part.class, p -> {
+				p.setPartTypeId(getPartTypeId(MultiSelectPartType.class));
+				p.setEditable(1);
+				p.setHidden(false);
+				p.setKeyname(SELECT_PART_NAME);
+				p.setName("Select", 1);
+				p.setInfoInt(rolesDatasource.getId());
+			}).doNotSave().build());
+		}).build();
+	}
+
+	@Parameter(0)
+	public String testCase;
+
+	@Parameter(1)
+	public String script;
+
+	@Parameter(2)
+	public String[] expectedRoles;
+
+	@Before
+	public void setup() throws NodeException, IOException {
+		testPage = update(testPage, p -> {
+			ContentTag contentTag = p.getContentTag(GROOVY_TAGNAME);
+
+			getPartType(GroovyPartType.class, contentTag, GROOVY_PART_NAME).setText(script);
+			getPartType(MultiSelectPartType.class, contentTag, SELECT_PART_NAME)
+					.setSelected(rolesDatasource.getEntries().get(0), rolesDatasource.getEntries().get(2));
+		}).publish().unlock().build();
+	}
+
+	@Test
+	public void test() throws NodeException {
+		try (Trx trx = new Trx(); RenderTypeTrx rTrx = RenderTypeTrx.publish(testPage)) {
+			Transaction t = trx.getTransaction();
+			MeshRoleRenderer meshRoleRenderer = new MeshRoleRenderer(Page.TYPE_PAGE,
+					"page.tags.%s.parts.%s.execute".formatted(GROOVY_TAGNAME, GROOVY_PART_NAME));
+
+			Collection<?> rolesRaw = ObjectTransformer.getCollection(
+					meshRoleRenderer.getRenderedTransformedValue(t.getRenderType(), t.getRenderResult(), null),
+					Collections.emptyList());
+			Set<String> roles = rolesRaw.stream().map(Object::toString).collect(Collectors.toSet());
+
+			assertThat(roles).as("Roles").containsOnly(expectedRoles);
+
+			trx.success();
+		}
+	}
+}
diff --git a/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/direct_script.hbs b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/direct_script.hbs
new file mode 100644
index 0000000000..f251e3df0a
--- /dev/null
+++ b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/direct_script.hbs
@@ -0,0 +1 @@
+{{gtx_script "testpackage.script"}}
\ No newline at end of file
diff --git a/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/direct_script.result b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/direct_script.result
new file mode 100644
index 0000000000..a97c0e15af
--- /dev/null
+++ b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/direct_script.result
@@ -0,0 +1 @@
+This is the script from testpackage called with param [default]
\ No newline at end of file
diff --git a/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/direct_script_with_param.dependencies b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/direct_script_with_param.dependencies
new file mode 100644
index 0000000000..17db0e3deb
--- /dev/null
+++ b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/direct_script_with_param.dependencies
@@ -0,0 +1 @@
+testPage:name
diff --git a/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/direct_script_with_param.hbs b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/direct_script_with_param.hbs
new file mode 100644
index 0000000000..518a250c9c
--- /dev/null
+++ b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/direct_script_with_param.hbs
@@ -0,0 +1 @@
+{{gtx_script "testpackage.script" param=cms.page.name}}
\ No newline at end of file
diff --git a/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/direct_script_with_param.result b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/direct_script_with_param.result
new file mode 100644
index 0000000000..e09eaff191
--- /dev/null
+++ b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/direct_script_with_param.result
@@ -0,0 +1 @@
+This is the script from testpackage called with param [Test Page]
\ No newline at end of file
diff --git a/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/foldername.dependencies b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/foldername.dependencies
new file mode 100644
index 0000000000..d476019ef2
--- /dev/null
+++ b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/foldername.dependencies
@@ -0,0 +1 @@
+testFolder:name
diff --git a/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/foldername.groovy b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/foldername.groovy
new file mode 100644
index 0000000000..232fc3e075
--- /dev/null
+++ b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/foldername.groovy
@@ -0,0 +1 @@
+return "The folder is $cms.folder.name"
diff --git a/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/foldername.result b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/foldername.result
new file mode 100644
index 0000000000..1fc32518c5
--- /dev/null
+++ b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/foldername.result
@@ -0,0 +1 @@
+The folder is Testfolder
\ No newline at end of file
diff --git a/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/foldername_script.dependencies b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/foldername_script.dependencies
new file mode 100644
index 0000000000..d476019ef2
--- /dev/null
+++ b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/foldername_script.dependencies
@@ -0,0 +1 @@
+testFolder:name
diff --git a/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/foldername_script.hbs b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/foldername_script.hbs
new file mode 100644
index 0000000000..78947c3d89
--- /dev/null
+++ b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/foldername_script.hbs
@@ -0,0 +1 @@
+{{gtx_script "testpackage.foldername"}}
\ No newline at end of file
diff --git a/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/foldername_script.result b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/foldername_script.result
new file mode 100644
index 0000000000..1fc32518c5
--- /dev/null
+++ b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/foldername_script.result
@@ -0,0 +1 @@
+The folder is Testfolder
\ No newline at end of file
diff --git a/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/import_class1.groovy b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/import_class1.groovy
new file mode 100644
index 0000000000..9af79a9fc0
--- /dev/null
+++ b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/import_class1.groovy
@@ -0,0 +1,3 @@
+import testpackage.Class1
+
+return Class1.simple()
\ No newline at end of file
diff --git a/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/import_class1.result b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/import_class1.result
new file mode 100644
index 0000000000..01a8ec3f05
--- /dev/null
+++ b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/import_class1.result
@@ -0,0 +1 @@
+Simple from testpackage.Class1
\ No newline at end of file
diff --git a/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/import_class2.groovy b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/import_class2.groovy
new file mode 100644
index 0000000000..8355959700
--- /dev/null
+++ b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/import_class2.groovy
@@ -0,0 +1,3 @@
+import testpackage.Class2
+
+return Class2.simple()
\ No newline at end of file
diff --git a/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/import_class2.result b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/import_class2.result
new file mode 100644
index 0000000000..ab8e4c91ee
--- /dev/null
+++ b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/import_class2.result
@@ -0,0 +1 @@
+testpackage.Class1 returning: Simple from testpackage.Class1
\ No newline at end of file
diff --git a/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/load_page_class.dependencies b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/load_page_class.dependencies
new file mode 100644
index 0000000000..b3935422de
--- /dev/null
+++ b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/load_page_class.dependencies
@@ -0,0 +1 @@
+targetPage:name
diff --git a/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/load_page_class.groovy b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/load_page_class.groovy
new file mode 100644
index 0000000000..0d1cc967c7
--- /dev/null
+++ b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/load_page_class.groovy
@@ -0,0 +1,3 @@
+import testpackage.Class1
+
+return Class1.pageName(cms.tag.parts.page.target.id)
diff --git a/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/load_page_class.result b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/load_page_class.result
new file mode 100644
index 0000000000..4efcfc816b
--- /dev/null
+++ b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/load_page_class.result
@@ -0,0 +1 @@
+Target Page
\ No newline at end of file
diff --git a/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/load_page_script.dependencies b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/load_page_script.dependencies
new file mode 100644
index 0000000000..b3935422de
--- /dev/null
+++ b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/load_page_script.dependencies
@@ -0,0 +1 @@
+targetPage:name
diff --git a/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/load_page_script.groovy b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/load_page_script.groovy
new file mode 100644
index 0000000000..7b1ce2a32c
--- /dev/null
+++ b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/load_page_script.groovy
@@ -0,0 +1,3 @@
+import com.gentics.api.Loader
+
+return Loader.page(cms.tag.parts.page.target.id).name
diff --git a/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/load_page_script.result b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/load_page_script.result
new file mode 100644
index 0000000000..4efcfc816b
--- /dev/null
+++ b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/load_page_script.result
@@ -0,0 +1 @@
+Target Page
\ No newline at end of file
diff --git a/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/otherpackage/Class1.groovy b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/otherpackage/Class1.groovy
new file mode 100644
index 0000000000..776b96b3b2
--- /dev/null
+++ b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/otherpackage/Class1.groovy
@@ -0,0 +1,7 @@
+package otherpackage
+
+class Class1 {
+	static String simple() {
+		"Simple from otherpackage.Class1"
+	}
+}
diff --git a/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/otherpackage/Class2.groovy b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/otherpackage/Class2.groovy
new file mode 100644
index 0000000000..7b7ac02178
--- /dev/null
+++ b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/otherpackage/Class2.groovy
@@ -0,0 +1,4 @@
+package otherpackage
+
+class Class2 {
+}
diff --git a/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/otherpackage/script.groovy b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/otherpackage/script.groovy
new file mode 100644
index 0000000000..446faff28e
--- /dev/null
+++ b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/otherpackage/script.groovy
@@ -0,0 +1,5 @@
+package otherpackage
+
+import groovy.transform.Field
+
+return "bla"
diff --git a/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/simple.groovy b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/simple.groovy
new file mode 100644
index 0000000000..658c464a87
--- /dev/null
+++ b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/simple.groovy
@@ -0,0 +1,2 @@
+def simpleResult = "This is the simple result"
+return simpleResult
diff --git a/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/simple.result b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/simple.result
new file mode 100644
index 0000000000..26ac36049c
--- /dev/null
+++ b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/simple.result
@@ -0,0 +1 @@
+This is the simple result
\ No newline at end of file
diff --git a/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/testpackage/Class1.groovy b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/testpackage/Class1.groovy
new file mode 100644
index 0000000000..b4af23b2be
--- /dev/null
+++ b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/testpackage/Class1.groovy
@@ -0,0 +1,13 @@
+package testpackage
+
+import com.gentics.api.Loader
+
+class Class1 {
+	static String simple() {
+		"Simple from testpackage.Class1"
+	}
+
+	static String pageName(int pageId) {
+		return Loader.page(pageId).name
+	}
+}
diff --git a/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/testpackage/Class2.groovy b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/testpackage/Class2.groovy
new file mode 100644
index 0000000000..8768ec759e
--- /dev/null
+++ b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/testpackage/Class2.groovy
@@ -0,0 +1,9 @@
+package testpackage
+
+import testpackage.Class1
+
+class Class2 {
+	static String simple() {
+		return "testpackage.Class1 returning: " + Class1.simple()
+	}
+}
diff --git a/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/testpackage/foldername.groovy b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/testpackage/foldername.groovy
new file mode 100644
index 0000000000..e5520e8829
--- /dev/null
+++ b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/testpackage/foldername.groovy
@@ -0,0 +1,3 @@
+package testpackage
+
+return "The folder is $cms.folder.name"
diff --git a/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/testpackage/script.groovy b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/testpackage/script.groovy
new file mode 100644
index 0000000000..496cb4ac23
--- /dev/null
+++ b/cms-core/src/test/resources/com/gentics/contentnode/tests/parttype/groovy/testpackage/script.groovy
@@ -0,0 +1,7 @@
+package testpackage
+
+import groovy.transform.Field
+
+@Field def String param = "default"
+
+return "This is the script from testpackage called with param [$param]"
diff --git a/cms-oss-bom/pom.xml b/cms-oss-bom/pom.xml
index 0bc4abf4d8..3cf8ad5544 100644
--- a/cms-oss-bom/pom.xml
+++ b/cms-oss-bom/pom.xml
@@ -433,6 +433,18 @@
 				<version>${handlebars.version}</version>
 			</dependency>
 
+			<!-- Groovy -->
+			<dependency>
+				<groupId>org.apache.groovy</groupId>
+				<artifactId>groovy</artifactId>
+				<version>${groovy.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.groovy</groupId>
+				<artifactId>groovy-json</artifactId>
+				<version>${groovy.version}</version>
+			</dependency>
+
 			<!--Test dependencies -->
 			<dependency>
 				<groupId>junit</groupId>
diff --git a/cms-oss-doc/src/main/guides.yml b/cms-oss-doc/src/main/guides.yml
index 885b755277..94ccb5bb84 100644
--- a/cms-oss-doc/src/main/guides.yml
+++ b/cms-oss-doc/src/main/guides.yml
@@ -110,6 +110,9 @@ index:
     - title: "Rendering with Handlebars"
       url: handlebars
       text: "Rendering in the CMS with Handlebars is an alternative to Velocity"
+    - title: "Implementation of Groovy Scripts"
+      url: groovy
+      text: "Business logic for preparation of data to be rendered can be implemented in Groovy scripts"
     - title: "Using Velocity in Tagtypes"
       url: impl_using_velocity
       text: "Learn how to use velocity in Tagtypes"
diff --git a/cms-oss-doc/src/main/source/devtools_overview.textile b/cms-oss-doc/src/main/source/devtools_overview.textile
index d21f9a9450..a2b14dbf75 100644
--- a/cms-oss-doc/src/main/source/devtools_overview.textile
+++ b/cms-oss-doc/src/main/source/devtools_overview.textile
@@ -27,6 +27,7 @@ Devtools will handle the following object types:
 * Internal static files (used only be the CMS, but not in the frontend)
 * Handlebars helpers (as JavaScript files)
 * Handlebars partials
+* Groovy scripts/classes
 
 The _datasources_, _tagtypes_, _object properties_ and _templates_ are still managed by the CMS and can be created, updated, deleted and used as always.
 Additionally, with the Devtools it is possible to synchronize selected objects into the filesystem of the CMS, where the objects can be edited and the
@@ -423,6 +424,10 @@ h4. Handlebars Partials
 
 Every +.hbs+ file located in the directory @/cms/packages/[package]/handlebars/helpers/@ is interpreted as a handlebars partial. See "Handlebars Partials":handlebars.html#partials for details.
 
+h4. Groovy Scripts
+
+Every +.groovy+ file located in the directory @/cms/packages/[package]/scripts/@ is interpreted as groovy script or groovy class. See "Groovy Scripts in Devtool Packages":groovy.html#groovy-scripts-in-devtool-packages for details.
+
 h4. Restrictions
 
 * Depending on the underlying filesystem, some characters are restricted from being used in directory or file names. Therefore, the names and keywords of
diff --git a/cms-oss-doc/src/main/source/gcn_part_types.textile b/cms-oss-doc/src/main/source/gcn_part_types.textile
index 00c816066a..de47be79fb 100644
--- a/cms-oss-doc/src/main/source/gcn_part_types.textile
+++ b/cms-oss-doc/src/main/source/gcn_part_types.textile
@@ -22,6 +22,7 @@ h3. Overview
 | 40        | Node                    | The node part is a drop-down menu with the nodes available to the user. |
 | 42        | Form                    | The CMS Form part lets the user select a form from the CMS. See "Gentics CMS Forms":feature_forms.html for details. **NOTE:** Parts of this type can only be used in the new Editor User Interface. |
 | 43        | Handlebars              | The Handlebars part type renders its content with the Handlebars rendering engine. See "Rendering with Handlebars":handlebars.html for details. |
+| 45        | Groovy                  | The Groovy part type allows to execute Groovy Scripts for preparation of data to be rendered. See "Implementation of Groovy Scripts":groovy.html for details. |
 
 NOTE: Inline editable parts - which are transformed to editables in Aloha Editor - should only use the part type @HTML@.
 
diff --git a/cms-oss-doc/src/main/source/groovy.textile b/cms-oss-doc/src/main/source/groovy.textile
new file mode 100644
index 0000000000..cba8c58eb8
--- /dev/null
+++ b/cms-oss-doc/src/main/source/groovy.textile
@@ -0,0 +1,164 @@
+h2. Implementation of Groovy Scripts
+
+Custom business logic necessary for preparation of data to be rendered with "handlebars":handlebars.html can be implemented using "Groovy":https://groovy-lang.org/
+either in the Groovy Part Type or in scripts contained in devtool packages.
+
+endprologue.
+
+h3. Groovy Part Type
+
+The Groovy Part Type can be used to add scripts directly in a construct or in tags. The Part will not render something itself,
+but the script can be executed by rendering its "attribute" @execute@.
+
+Example:
+
+In the following example we assume a construct having two parts: @script@ (Groovy Part Type) and @hbs@ (Handlebars Part Type).
+
+<shell filename="script">
+return [
+  currentpage: [
+    "name": cms.page.name,
+    "id": cms.page.id
+  ]
+]
+</shell>
+
+<shell filename="hbs">
+{{#with cms.tag.parts.script.execute}}
+{{currentpage.name}} ({{currentpage.id}})
+{{/with}}
+</shell>
+
+The example shows how to execute the script from the Groovy Part Type while rendering the Handlebars Part Type and how to use the script result.
+
+h3. Groovy Scripts in Devtool Packages
+
+In order to make code reusable, it can be put into Groovy scripts or even classes as part of devtool packages. For better understanding
+of the distinction between "script" and "class" consult "Scripts versus classes":https://groovy-lang.org/structure.html#_scripts_versus_classes
+in the Groovy documentation.
+
+The following functionality matrix will help to decide, when to use scripts and when to use classes:
+
+|                                    |_. Script |_. Class |
+|_. Access to @cms@ base object        | !images/gcn_icons/ok.gif(Yes)!     | !images/gcn_icons/remove.gif(No)! |
+|_. Reusable/importable by other code  | !images/gcn_icons/remove.gif(No)!  | !images/gcn_icons/ok.gif(Yes)!    |
+|_. Can hold state (fields)            | !images/gcn_icons/remove.gif(No)!  | !images/gcn_icons/ok.gif(Yes)!    |
+|_. Executed directly (top-level code) | !images/gcn_icons/ok.gif(Yes)!     | !images/gcn_icons/remove.gif(No)! |
+
+Example: Combining a Script and a Class
+
+The following example shows the devtool package @helpers@, containing both a class and a script. Both files are placed in the package's @scripts@
+directory, as described in "Devtool Packages":devtools_overview.html#groovy-scripts.
+
+The class @Greeter@ implements a method @greet@, which expects a name and a page object as arguments. It reads the page's @name@ and combines it
+with the given name into a greeting:
+
+<shell filename="/cms/packages/helpers/scripts/Greeter.groovy">
+package helpers
+
+class Greeter {
+	static String greet(String name, page) {
+		return "Hello ${name}, welcome to \"${page.name}\"!"
+	}
+}
+</shell>
+
+The script @greeting@ accepts the parameter @name@, imports the class @Greeter@ and passes the parameter together with the current page
+(resolved via @cms.page@) to the method @greet@:
+
+<shell filename="/cms/packages/helpers/scripts/greeting.groovy">
+package helpers
+
+import groovy.transform.Field
+import helpers.Greeter
+
+@Field def String name = ""
+
+return Greeter.greet(name, cms.page)
+</shell>
+
+The script can then be executed from a Handlebars Part Type, passing a value for the parameter @name@:
+
+<shell filename="hbs">
+{{gtx_script "helpers.greeting" name="World"}}
+</shell>
+
+NOTE: The name of the script (@helpers.greeting@ in this example) is constructed from the name of the Groovy package and the filename of the script
+(without the @.groovy@ extension), separated by a dot.
+
+NOTE: In order to handle possible namespace conflicts, it is highly recommended to always use the name of the devtool package also as name of the Groovy package
+for any script or class defined in a devtool package. See the examples above, which follow this guideline.
+
+h3. Accessing "cms"
+
+Like Handlebars, the base object @cms@ will be available in all scripts and can be used to resolve base objects similar to "Handlebars":handlebars.html#resolving.
+
+Note: The @cms@ base object will not be available per default in Groovy classes, so any object, which shall be processed in Groovy classes must be passed as method arguments
+to class methods.
+
+h3. Loading CMS objects
+
+If any objects other than the base objects, which can be resolved from @cms@ have to be used, they can be loaded with the help of the class @com.gentics.api.Loader@.
+
+The class contains the following static methods:
+
+|_. Name |_. Description |_. Example |
+| @Loader.object(type, id)@ | Load the object of given @type@ with the @id@. The @type@ can either be a number or a string (see table below). The @id@ can either be a local id (as number) or a global id (as string). | def page = Loader.object("page", 47) |
+| @Loader.page(id)@ | Load the page with the @id@. The @id@ can either be a local id (as number) or a global id (as string). | def page = Loader.page(47) |
+| @Loader.folder(id)@ | Load the folder with the @id@. The @id@ can either be a local id (as number) or a global id (as string). | def folder = Loader.folder(47) |
+| @Loader.file(id)@ | Load the file with the @id@. The @id@ can either be a local id (as number) or a global id (as string). | def file = Loader.file(47) |
+| @Loader.image(id)@ | Load the image with the @id@. The @id@ can either be a local id (as number) or a global id (as string). | def image = Loader.image(47) |
+| @Loader.node(id)@ | Load the node with the @id@. The @id@ can either be a local id (as number) or a global id (as string). | def node = Loader.node(47) |
+
+The following @types@ are supported
+
+|_. Name |_. string |_. int |
+| Page   | page     | 10007 |
+| Folder | folder   | 10002 |
+| File   | file     | 10008 |
+| Image  | image    | 10011 |
+| Node   | node     | 10001 |
+
+WARNING: It it strongly recommended to only load objects either be resolving from the @cms@ base object or by using the @com.gentics.api.Loader@. Any other methods will most probably lead to unexpected and unwanted behaviour and errors.
+
+h3. Executing code in the scope of a Channel
+
+Code that needs to be executed in the scope of a channel (especially loading and resolving of objects) can be wrapped into channel scope with the help of class @com.gentics.api.ChannelScope@.
+
+The usage is a follows:
+
+<shell>
+import com.gentics.api.Loader
+import com.gentics.api.ChannelScope
+
+def channelId = 17
+def pageInCurrentChannel = cms.page
+def pageInOtherChannel = ChannelScope.withChannel(channelId) {
+    c -> Loader.page(cms.page.id)
+}
+</shell>
+
+h3. Cross-package usage
+
+It is possible to import classes from other devtool packages, if both devtool packages are assigned to the rendered node.
+In order to make this possible, the CMS will compile all scripts found in all assigned devtool packages together per node.
+When the assignment of devtool packages to a node is changed (a new package added or a package removed) or any script file
+in an existing devtool package is modified, all scripts will be recompiled.
+
+h3. Handling of compilation errors
+
+If any of the scripts contained in a devtool package cannot be compiled (due to a syntax error, missing imports or other reasons), this will
+affect all Groovy script executions in all nodes to which the devtool package is assigned. All tags with Handlebars Part Types, that are calling scripts
+(either with the @gtx_script@ helper or by rendering @execute@ of a Groovy Part) will fail to render. The causing compilation error is logged in the
+browser console of the page preview and the publish process will fail (right after the start) also showing the causing compilation error.
+
+h3. Dependency Handling
+
+If implemented properly (see "Loading CMS objects":#loading-cms-objects), dependencies to CMS objects used in Groovy scripts will be handled by the CMS.
+
+Changes in Groovy scripts contained in Groovy Part Types will also be handled by the internal dependency management.
+
+WARNING: The usage of groovy scripts and classes from devtool packages will *not* be tracked by the internal dependency management. If any script or class in a
+devtool package is modified, republishing of the affected objects needs to be done manually.
+
+.
diff --git a/cms-oss-doc/src/main/source/handlebars.textile b/cms-oss-doc/src/main/source/handlebars.textile
index afbf4d4016..905e3584a4 100644
--- a/cms-oss-doc/src/main/source/handlebars.textile
+++ b/cms-oss-doc/src/main/source/handlebars.textile
@@ -65,6 +65,7 @@ h4. Additional Helpers
 | "gtx_gis":#gtx_gis | Include a resized image into the output | +<img src="{{gtx_gis cms.tag.parts.image width=100 mode="prop" }}">+ |
 | "gtx_form":#gtx_form | Include a form | +{{gtx_form cms.tag.parts.form type="java" }}+ |
 | "gtx_i18n":#gtx_i18n | Include a translation in the language of the currently rendered page | +{{gtx_i18n de="Deutsch" en="English" default="Other language" }}+ |
+| "gtx_script":#gtx_script | Execute a script from a devtool package and render the output | +{{gtx_script "demopackage.scriptname" page=cms.page}}+ |
 
 h5. gtx_render
 
@@ -266,6 +267,23 @@ Finally it will fall back to "default".
 
 If no translation is found, it will render nothing.
 
+h5. gtx_script
+
+This helper executes a groovy script from a devtool package and renders the output.
+
+General usage is:
+
+<shell>
+{{gtx_script [scriptname] [param1=value1 param2=value2 ...]}}
+</shell>
+
+With the parameters
+
+|_. Name |_. Description |_. Default |
+| +scriptname+ | Fully qualified name of the script to be executed | _mandatory_ |
+
+All other parameters will be injected into the script context. See "Groovy Scripts in Devtool Packages":groovy.html#groovy-scripts-in-devtool-packages for details.
+
 h4. Custom helpers
 
 For implementation of custom logic, it is possible to create helpers as Javascript files in devtool packages.
@@ -321,6 +339,9 @@ Usage of the helper:
 {{/implementation_package.render_tag}}
 </shell>
 
+WARNING: The usage of custom helpers from devtool packages will *not* be tracked by the internal dependency management. If any helper in a
+devtool package is modified, republishing of the affected objects needs to be done manually.
+
 h5. Default package helpers
 
 Currently the only tagtype in the default package that uses Handlebars is the "Aloha Page Link Tag":https://www.gentics.com/Content.Node/guides/aloha_gcn_alohapagelink.html which uses the @gtx_alohalink@ helper also contained in the default package. Since helpers must always be prefixed with their respective package names, a custom implementation of the Aloha Page Link Tag requires adding the tag to a custom package, then adding a custom helper for use in the Handlebars part and calling that helper with the package prefix (see the "Aloha Page Link Tag":https://www.gentics.com/Content.Node/guides/aloha_gcn_alohapagelink.html#customizing-the-aloha-editor-page-link-tag guide).
@@ -351,6 +372,9 @@ will be available as partial +implementation_package.render_name+ and can be use
 
 NOTE: Partials will not be synchonized into the CMS, so changes in a partial file will be effective immediately.
 
+WARNING: The usage of partials from devtool packages will *not* be tracked by the internal dependency management. If any partial in a
+devtool package is modified, republishing of the affected objects needs to be done manually.
+
 h3. Differences to Velocity
 
 This section will cover some differences between the Velocity PartType and the Handlebars PartType (apart from the obvious difference in templating language syntax), which hopefully will help with migration of implementations.
diff --git a/cms-ui/apps/admin-ui/public/i18n/de.json b/cms-ui/apps/admin-ui/public/i18n/de.json
index e0886de97c..d4349b0ade 100644
--- a/cms-ui/apps/admin-ui/public/i18n/de.json
+++ b/cms-ui/apps/admin-ui/public/i18n/de.json
@@ -1441,6 +1441,7 @@
         "tagPartType_41": "Formular Liste",
         "tagPartType_42": "Formular",
         "tagPartType_43": "Handlebars",
+        "tagPartType_45": "Groovy",
         "validator_name_number_natural": "Zahl (natürlich)",
         "validator_name_email_address": "E-Mail Adresse",
         "validator_name_must_not_be_emty": "Nicht leer",
diff --git a/cms-ui/apps/admin-ui/public/i18n/en.json b/cms-ui/apps/admin-ui/public/i18n/en.json
index b3039a8c80..7993ecbc97 100644
--- a/cms-ui/apps/admin-ui/public/i18n/en.json
+++ b/cms-ui/apps/admin-ui/public/i18n/en.json
@@ -1441,6 +1441,7 @@
         "tagPartType_41": "Form List",
         "tagPartType_42": "Form",
         "tagPartType_43": "Handlebars",
+        "tagPartType_45": "Groovy",
         "validator_name_number_natural": "Number (natural)",
         "validator_name_email_address": "E-mail address",
         "validator_name_must_not_be_emty": "May not be empty",
diff --git a/cms-ui/apps/admin-ui/src/app/features/construct/components/construct-part-properties/construct-part-properties.component.ts b/cms-ui/apps/admin-ui/src/app/features/construct/components/construct-part-properties/construct-part-properties.component.ts
index 8cbd9b2139..8f812c2c4d 100644
--- a/cms-ui/apps/admin-ui/src/app/features/construct/components/construct-part-properties/construct-part-properties.component.ts
+++ b/cms-ui/apps/admin-ui/src/app/features/construct/components/construct-part-properties/construct-part-properties.component.ts
@@ -96,6 +96,7 @@ export const VIABLE_CONSTRUCT_PART_TYPES: TagPartType[] = [
     TagPartType.SelectMultiple,
     TagPartType.Velocity,
     TagPartType.Handlebars,
+    TagPartType.Groovy,
 ];
 
 export const REMOVED_CONSTRUCT_PART_TYPES: TagPartType[] = [
diff --git a/cms-ui/libs/cms-models/src/lib/tag-part-types.ts b/cms-ui/libs/cms-models/src/lib/tag-part-types.ts
index 04c25ec12d..35479dbbeb 100644
--- a/cms-ui/libs/cms-models/src/lib/tag-part-types.ts
+++ b/cms-ui/libs/cms-models/src/lib/tag-part-types.ts
@@ -175,6 +175,11 @@ export enum TagPartType {
     CmsForm = 42,
 
     Handlebars = 43,
+
+    /**
+     * Groovy Part Type for adding groovy scripts
+     */
+    Groovy = 45,
 }
 
 /** Pairs must be set correctly. */
@@ -210,6 +215,7 @@ export const TagPartTypePropertyType: Readonly<{ [key in TagPartType]: TagProper
     [TagPartType.Form]: TagPropertyType.FORM,
     [TagPartType.CmsForm]: TagPropertyType.CMSFORM,
     [TagPartType.Handlebars]: TagPropertyType.RICHTEXT,
+    [TagPartType.Groovy]: TagPropertyType.RICHTEXT,
 } as const;
 
 /**
diff --git a/pom.xml b/pom.xml
index 9e880ea1b9..15113fd575 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,6 +81,7 @@
 		<commons-io.version>2.20.0</commons-io.version>
 
 		<handlebars.version>4.5.4</handlebars.version>
+		<groovy.version>5.0.8</groovy.version>
 
 		<servlet-api.version>6.0.0</servlet-api.version>
 		<activation-api.version>2.1.3</activation-api.version>