diff --git a/xwiki-rendering-api/src/main/java/org/xwiki/rendering/block/Block.java b/xwiki-rendering-api/src/main/java/org/xwiki/rendering/block/Block.java
index 333192035..71da77320 100644
--- a/xwiki-rendering-api/src/main/java/org/xwiki/rendering/block/Block.java
+++ b/xwiki-rendering-api/src/main/java/org/xwiki/rendering/block/Block.java
@@ -29,7 +29,6 @@
 import org.xwiki.rendering.block.match.BlockMatcher;
 import org.xwiki.rendering.listener.Listener;
 import org.xwiki.rendering.syntax.Syntax;
-import org.xwiki.stability.Unstable;
 
 /**
  * Represents an element of a XWiki Document's content. For example there are Blocks for Paragraphs, Bold parts,
@@ -288,7 +287,6 @@ enum Axes
      * @return all attributes
      * @since 15.9RC1
      */
-    @Unstable
     default Map<String, Object> getAttributes()
     {
         return Map.of();
@@ -306,7 +304,6 @@ default Map<String, Object> getAttributes()
      * @return the attribute or null if the attribute doesn't exist
      * @since 15.9RC1
      */
-    @Unstable
     default Object getAttribute(String name)
     {
         return null;
@@ -319,7 +316,6 @@ default Object getAttribute(String name)
      * @param value the attribute's value
      * @since 15.9RC1
      */
-    @Unstable
     void setAttribute(String name, Object value);
 
     /**
@@ -329,7 +325,6 @@ default Object getAttribute(String name)
      * @see #getAttribute(String)
      * @since 15.9RC1
      */
-    @Unstable
     void setAttributes(Map<String, Object> attributes);
 
     /**
@@ -360,7 +355,6 @@ default Object getAttribute(String name)
      * @return the syntax of the block or null of none could be found
      * @since 15.9RC1
      */
-    @Unstable
     default Optional<Syntax> getSyntaxMetadata()
     {
         return Optional.empty();
@@ -375,7 +369,6 @@ default Optional<Syntax> getSyntaxMetadata()
      * @return the value found in the provided block axes
      * @since 15.9RC1
      */
-    @Unstable
     default <T> Optional<T> get(Function<Block, Optional<T>> searcher, Axes axes)
     {
         return Optional.empty();
diff --git a/xwiki-rendering-api/src/main/java/org/xwiki/rendering/block/match/FunctionBlockMatcher.java b/xwiki-rendering-api/src/main/java/org/xwiki/rendering/block/match/FunctionBlockMatcher.java
index 4bdbd3290..c9b0f4d9b 100644
--- a/xwiki-rendering-api/src/main/java/org/xwiki/rendering/block/match/FunctionBlockMatcher.java
+++ b/xwiki-rendering-api/src/main/java/org/xwiki/rendering/block/match/FunctionBlockMatcher.java
@@ -23,7 +23,6 @@
 import java.util.function.Function;
 
 import org.xwiki.rendering.block.Block;
-import org.xwiki.stability.Unstable;
 
 /**
  * Search for a specific value in a {@link Block}.
@@ -32,7 +31,6 @@
  * @version $Id$
  * @since 15.9RC1
  */
-@Unstable
 public class FunctionBlockMatcher<T> implements BlockMatcher
 {
     private final Function<Block, Optional<T>> function;
diff --git a/xwiki-rendering-api/src/main/java/org/xwiki/rendering/block/match/MetadataBlockMatcher.java b/xwiki-rendering-api/src/main/java/org/xwiki/rendering/block/match/MetadataBlockMatcher.java
index 82adc6572..02c04d2f9 100644
--- a/xwiki-rendering-api/src/main/java/org/xwiki/rendering/block/match/MetadataBlockMatcher.java
+++ b/xwiki-rendering-api/src/main/java/org/xwiki/rendering/block/match/MetadataBlockMatcher.java
@@ -22,7 +22,6 @@
 import org.xwiki.rendering.block.Block;
 import org.xwiki.rendering.block.MetaDataBlock;
 import org.xwiki.rendering.listener.MetaData;
-import org.xwiki.stability.Unstable;
 
 /**
  * Implementation of {@link BlockMatcher} which matches {@link MetaData} information.
@@ -37,7 +36,6 @@ public class MetadataBlockMatcher extends ClassBlockMatcher
      * 
      * @since 15.9RC1
      */
-    @Unstable
     public static final MetadataBlockMatcher SYNTAX = new MetadataBlockMatcher(MetaData.SYNTAX);
 
     /**
diff --git a/xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/ListenerProvider.java b/xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/ListenerProvider.java
index 401cfff9e..c34db8656 100644
--- a/xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/ListenerProvider.java
+++ b/xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/ListenerProvider.java
@@ -23,7 +23,6 @@
 import org.xwiki.rendering.listener.chaining.ChainingListener;
 import org.xwiki.rendering.listener.chaining.ListenerChain;
 import org.xwiki.rendering.syntax.Syntax;
-import org.xwiki.stability.Unstable;
 
 /**
  * Allows to access listener instances.
@@ -33,7 +32,6 @@
  * @since 14.10.8
  */
 @Role
-@Unstable
 public interface ListenerProvider
 {
     /**
diff --git a/xwiki-rendering-api/src/main/java/org/xwiki/rendering/transformation/Transformation.java b/xwiki-rendering-api/src/main/java/org/xwiki/rendering/transformation/Transformation.java
index dcc1c1225..1122a3975 100644
--- a/xwiki-rendering-api/src/main/java/org/xwiki/rendering/transformation/Transformation.java
+++ b/xwiki-rendering-api/src/main/java/org/xwiki/rendering/transformation/Transformation.java
@@ -23,7 +23,6 @@
 import org.xwiki.rendering.block.Block;
 import org.xwiki.rendering.block.XDOM;
 import org.xwiki.rendering.syntax.Syntax;
-import org.xwiki.stability.Unstable;
 
 /**
  * Performs a transformation on a XDOM (i.e. a tree of {@link org.xwiki.rendering.block.Block}. This used for example
@@ -73,7 +72,6 @@ public interface Transformation extends Comparable<Transformation>
      * @param block the block to prepare (can be an {@link XDOM})
      * @since 15.9RC1
      */
-    @Unstable
     default void prepare(Block block)
     {
         // Do nothing by default
diff --git a/xwiki-rendering-macros/xwiki-rendering-macro-box/src/main/java/org/xwiki/rendering/macro/box/AbstractBoxMacro.java b/xwiki-rendering-macros/xwiki-rendering-macro-box/src/main/java/org/xwiki/rendering/macro/box/AbstractBoxMacro.java
index 1916ce38d..0324e9033 100644
--- a/xwiki-rendering-macros/xwiki-rendering-macro-box/src/main/java/org/xwiki/rendering/macro/box/AbstractBoxMacro.java
+++ b/xwiki-rendering-macros/xwiki-rendering-macro-box/src/main/java/org/xwiki/rendering/macro/box/AbstractBoxMacro.java
@@ -44,7 +44,6 @@
 import org.xwiki.rendering.macro.descriptor.ContentDescriptor;
 import org.xwiki.rendering.parser.ResourceReferenceParser;
 import org.xwiki.rendering.transformation.MacroTransformationContext;
-import org.xwiki.stability.Unstable;
 
 /**
  * Draw a box around provided content.
@@ -326,7 +325,6 @@ protected abstract List<Block> parseContent(P parameters, String content, MacroT
      * @since 15.0RC1
      * @since 14.10.2
      */
-    @Unstable
     protected boolean isContentChecked()
     {
         return true;
diff --git a/xwiki-rendering-macros/xwiki-rendering-macro-toc/src/main/java/org/xwiki/rendering/macro/toc/TocEntriesResolver.java b/xwiki-rendering-macros/xwiki-rendering-macro-toc/src/main/java/org/xwiki/rendering/macro/toc/TocEntriesResolver.java
index 6e03ff4a1..6d0b98d00 100644
--- a/xwiki-rendering-macros/xwiki-rendering-macro-toc/src/main/java/org/xwiki/rendering/macro/toc/TocEntriesResolver.java
+++ b/xwiki-rendering-macros/xwiki-rendering-macro-toc/src/main/java/org/xwiki/rendering/macro/toc/TocEntriesResolver.java
@@ -24,7 +24,6 @@
 import org.xwiki.component.annotation.Role;
 import org.xwiki.rendering.block.Block;
 import org.xwiki.rendering.block.HeaderBlock;
-import org.xwiki.stability.Unstable;
 
 /**
  * Resolve the entries to use for the table of content for a given root block.
@@ -33,7 +32,6 @@
  * @since 15.8RC1
  */
 @Role
-@Unstable
 public interface TocEntriesResolver
 {
     /**
diff --git a/xwiki-rendering-macros/xwiki-rendering-macro-toc/src/main/java/org/xwiki/rendering/macro/toc/TocEntryExtension.java b/xwiki-rendering-macros/xwiki-rendering-macro-toc/src/main/java/org/xwiki/rendering/macro/toc/TocEntryExtension.java
index d284d9a9a..62ce4348e 100644
--- a/xwiki-rendering-macros/xwiki-rendering-macro-toc/src/main/java/org/xwiki/rendering/macro/toc/TocEntryExtension.java
+++ b/xwiki-rendering-macros/xwiki-rendering-macro-toc/src/main/java/org/xwiki/rendering/macro/toc/TocEntryExtension.java
@@ -24,7 +24,6 @@
 import org.xwiki.component.annotation.Role;
 import org.xwiki.rendering.block.Block;
 import org.xwiki.rendering.block.HeaderBlock;
-import org.xwiki.stability.Unstable;
 
 /**
  * Table of content entry extension, allowing to intercept and improve the default rendering of the table of content
@@ -37,7 +36,6 @@
  * @since 15.8RC1
  */
 @Role
-@Unstable
 public interface TocEntryExtension
 {
     /**
diff --git a/xwiki-rendering-macros/xwiki-rendering-macro-toc/src/main/java/org/xwiki/rendering/macro/toc/TocTreeBuilderFactory.java b/xwiki-rendering-macros/xwiki-rendering-macro-toc/src/main/java/org/xwiki/rendering/macro/toc/TocTreeBuilderFactory.java
index 388a094a6..b59073f23 100644
--- a/xwiki-rendering-macros/xwiki-rendering-macro-toc/src/main/java/org/xwiki/rendering/macro/toc/TocTreeBuilderFactory.java
+++ b/xwiki-rendering-macros/xwiki-rendering-macro-toc/src/main/java/org/xwiki/rendering/macro/toc/TocTreeBuilderFactory.java
@@ -22,7 +22,6 @@
 import org.xwiki.component.annotation.Role;
 import org.xwiki.component.manager.ComponentLookupException;
 import org.xwiki.rendering.internal.macro.toc.TocTreeBuilder;
-import org.xwiki.stability.Unstable;
 
 /**
  * Provide the operations to build a {@link TocTreeBuilder}, possibly based on a hint used to select the heading
@@ -32,7 +31,6 @@
  * @since 15.8RC1
  */
 @Role
-@Unstable
 public interface TocTreeBuilderFactory
 {
     /**
diff --git a/xwiki-rendering-transformations/xwiki-rendering-transformation-macro/src/main/java/org/xwiki/rendering/macro/MacroContentParser.java b/xwiki-rendering-transformations/xwiki-rendering-transformation-macro/src/main/java/org/xwiki/rendering/macro/MacroContentParser.java
index be13cb2e7..a883714f5 100644
--- a/xwiki-rendering-transformations/xwiki-rendering-transformation-macro/src/main/java/org/xwiki/rendering/macro/MacroContentParser.java
+++ b/xwiki-rendering-transformations/xwiki-rendering-transformation-macro/src/main/java/org/xwiki/rendering/macro/MacroContentParser.java
@@ -25,7 +25,6 @@
 import org.xwiki.rendering.listener.MetaData;
 import org.xwiki.rendering.syntax.Syntax;
 import org.xwiki.rendering.transformation.MacroTransformationContext;
-import org.xwiki.stability.Unstable;
 
 /**
  * Parses content of a macro field (parameter, macro content) in a given syntax.
@@ -41,7 +40,6 @@ public interface MacroContentParser
      * 
      * @since 15.9RC1
      */
-    @Unstable
     String ATTRIBUTE_PREPARE_CONTENT_XDOM = "prepare.content.xdom";
 
     /**
@@ -89,7 +87,6 @@ XDOM parse(String content, MacroTransformationContext macroContext, boolean tran
      * @since 15.1RC1
      * @since 14.10.5
      */
-    @Unstable
     default XDOM parse(String content, Syntax syntax, MacroTransformationContext macroContext, boolean transform,
         MetaData metadata, boolean inline) throws MacroExecutionException
     {
@@ -112,7 +109,6 @@ default XDOM parse(String content, Syntax syntax, MacroTransformationContext mac
      * @throws MacroPreparationException when failing to prepare the content
      * @since 15.9RC1
      */
-    @Unstable
     default void prepareContentWiki(MacroBlock macroBlock) throws MacroPreparationException
     {
         prepareContentWiki(macroBlock, null);
@@ -127,7 +123,6 @@ default void prepareContentWiki(MacroBlock macroBlock) throws MacroPreparationEx
      * @throws MacroPreparationException when failing to prepare the content
      * @since 15.9RC1
      */
-    @Unstable
     default void prepareContentWiki(MacroBlock macroBlock, Syntax syntax) throws MacroPreparationException
     {
         
diff --git a/xwiki-rendering-transformations/xwiki-rendering-transformation-macro/src/main/java/org/xwiki/rendering/macro/source/MacroContentSourceReference.java b/xwiki-rendering-transformations/xwiki-rendering-transformation-macro/src/main/java/org/xwiki/rendering/macro/source/MacroContentSourceReference.java
index c48cce13c..2fc816237 100644
--- a/xwiki-rendering-transformations/xwiki-rendering-transformation-macro/src/main/java/org/xwiki/rendering/macro/source/MacroContentSourceReference.java
+++ b/xwiki-rendering-transformations/xwiki-rendering-transformation-macro/src/main/java/org/xwiki/rendering/macro/source/MacroContentSourceReference.java
@@ -22,7 +22,6 @@
 import java.util.Objects;
 
 import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.xwiki.stability.Unstable;
 
 /**
  * The reference of a wiki content to use as macro content.
@@ -31,7 +30,6 @@
  * @since 15.1RC1
  * @since 14.10.5
  */
-@Unstable
 public class MacroContentSourceReference
 {
     /**
diff --git a/xwiki-rendering-transformations/xwiki-rendering-transformation-macro/src/main/java/org/xwiki/rendering/macro/source/MacroContentSourceReferenceConverter.java b/xwiki-rendering-transformations/xwiki-rendering-transformation-macro/src/main/java/org/xwiki/rendering/macro/source/MacroContentSourceReferenceConverter.java
index 7470bf7b9..fe9982be6 100644
--- a/xwiki-rendering-transformations/xwiki-rendering-transformation-macro/src/main/java/org/xwiki/rendering/macro/source/MacroContentSourceReferenceConverter.java
+++ b/xwiki-rendering-transformations/xwiki-rendering-transformation-macro/src/main/java/org/xwiki/rendering/macro/source/MacroContentSourceReferenceConverter.java
@@ -20,7 +20,6 @@
 package org.xwiki.rendering.macro.source;
 
 import org.xwiki.component.annotation.Role;
-import org.xwiki.stability.Unstable;
 
 /**
  * Convert an object into a {@link MacroContentSourceReference}.
@@ -31,7 +30,6 @@
  * @since 14.10.5
  */
 @Role
-@Unstable
 public interface MacroContentSourceReferenceConverter<T>
 {
     /**
diff --git a/xwiki-rendering-transformations/xwiki-rendering-transformation-macro/src/main/java/org/xwiki/rendering/macro/source/MacroContentWikiSource.java b/xwiki-rendering-transformations/xwiki-rendering-transformation-macro/src/main/java/org/xwiki/rendering/macro/source/MacroContentWikiSource.java
index b11da664a..ef5762fef 100644
--- a/xwiki-rendering-transformations/xwiki-rendering-transformation-macro/src/main/java/org/xwiki/rendering/macro/source/MacroContentWikiSource.java
+++ b/xwiki-rendering-transformations/xwiki-rendering-transformation-macro/src/main/java/org/xwiki/rendering/macro/source/MacroContentWikiSource.java
@@ -23,7 +23,6 @@
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.xwiki.rendering.syntax.Syntax;
-import org.xwiki.stability.Unstable;
 import org.xwiki.text.XWikiToStringBuilder;
 
 /**
@@ -33,7 +32,6 @@
  * @since 15.1RC1
  * @since 14.10.5
  */
-@Unstable
 public class MacroContentWikiSource
 {
     private final MacroContentSourceReference reference;
diff --git a/xwiki-rendering-transformations/xwiki-rendering-transformation-macro/src/main/java/org/xwiki/rendering/macro/source/MacroContentWikiSourceFactory.java b/xwiki-rendering-transformations/xwiki-rendering-transformation-macro/src/main/java/org/xwiki/rendering/macro/source/MacroContentWikiSourceFactory.java
index fc3746554..b656fb03a 100644
--- a/xwiki-rendering-transformations/xwiki-rendering-transformation-macro/src/main/java/org/xwiki/rendering/macro/source/MacroContentWikiSourceFactory.java
+++ b/xwiki-rendering-transformations/xwiki-rendering-transformation-macro/src/main/java/org/xwiki/rendering/macro/source/MacroContentWikiSourceFactory.java
@@ -22,7 +22,6 @@
 import org.xwiki.component.annotation.Role;
 import org.xwiki.rendering.macro.MacroExecutionException;
 import org.xwiki.rendering.transformation.MacroTransformationContext;
-import org.xwiki.stability.Unstable;
 
 /**
  * Fetch a wiki content based on its reference.
@@ -32,7 +31,6 @@
  * @since 14.10.5
  */
 @Role
-@Unstable
 public interface MacroContentWikiSourceFactory
 {
     /**