diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2b4e9ef9aeb..4cb4b0fb15c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,4 +11,4 @@ on:
 
 jobs:
   build:
-    uses: eclipse-platform/eclipse.platform.releng.aggregator/.github/workflows/mavenBuild.yml@master
+    uses: HannesWell/eclipse.platform.releng.aggregator/.github/workflows/mavenBuild.yml@unify-maven-options
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index fe3b497f25a..7ab7407a4b7 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -11,4 +11,4 @@ on:
 
 jobs:
   callCodeQLworkflow:
-    uses: eclipse-platform/eclipse.platform.releng.aggregator/.github/workflows/codeQLworkflow.yml@master
+    uses: HannesWell/eclipse.platform.releng.aggregator/.github/workflows/codeQLworkflow.yml@unify-maven-options
diff --git a/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/EHandlerService.java b/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/EHandlerService.java
index f093a38c3be..6b0800257f9 100644
--- a/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/EHandlerService.java
+++ b/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/EHandlerService.java
@@ -69,6 +69,9 @@
  */
 public interface EHandlerService {
 
+//	default void doSomething() {
+//	}
+
 	/**
 	 * Makes the passed <code>handler</code> active for the command with the passed
 	 * <code>commandId</code>.
diff --git a/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/ExpressionContext.java b/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/ExpressionContext.java
index 4bdfc234b2b..50de5a4e47e 100644
--- a/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/ExpressionContext.java
+++ b/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/ExpressionContext.java
@@ -26,6 +26,8 @@
  * @noextend This class is not intended to be subclassed by clients.
  */
 public class ExpressionContext implements IEvaluationContext {
+	// Some remark
+
 	/**
 	 * See org.eclipse.e4.ui.services.IServiceConstants.ACTIVE_SELECTION
 	 */