diff --git a/client/src/main/java/com/vaadin/client/ApplicationConfiguration.java b/client/src/main/java/com/vaadin/client/ApplicationConfiguration.java
index 9a8fce9b563..14f9b344866 100644
--- a/client/src/main/java/com/vaadin/client/ApplicationConfiguration.java
+++ b/client/src/main/java/com/vaadin/client/ApplicationConfiguration.java
@@ -313,6 +313,8 @@ public String getServiceUrl() {
      * Gets the URL to the context root of the web application
      *
      * @return the URL to the server-side context root as a string
+     *
+     * @since 8.0.3
      */
     public String getContextRootUrl() {
         return contextRootUrl;
diff --git a/client/src/main/java/com/vaadin/client/metadata/ConnectorBundleLoader.java b/client/src/main/java/com/vaadin/client/metadata/ConnectorBundleLoader.java
index 8b3e53aea09..7c515e2c7cf 100644
--- a/client/src/main/java/com/vaadin/client/metadata/ConnectorBundleLoader.java
+++ b/client/src/main/java/com/vaadin/client/metadata/ConnectorBundleLoader.java
@@ -214,6 +214,8 @@ public void onTouchStart(TouchStartEvent event) {
 
     /**
      * Starts loading the deferred bundle if it hasn't already been started.
+     *
+     * @since 8.0.3
      */
     public void ensureDeferredBundleLoaded() {
         if (!isBundleLoaded(DEFERRED_BUNDLE_NAME)) {
@@ -242,6 +244,8 @@ private static Logger getLogger() {
      * This method is intended for testing the loading mechanism.
      *
      * @return a list of bundles, not <code>null</code>
+     *
+     * @since 8.0.3
      */
     public List<String> getLoadedBundles() {
         ArrayList<String> bundles = new ArrayList<>();
diff --git a/server/src/main/java/com/vaadin/navigator/Navigator.java b/server/src/main/java/com/vaadin/navigator/Navigator.java
index 96660d80a2b..e05244f02a6 100644
--- a/server/src/main/java/com/vaadin/navigator/Navigator.java
+++ b/server/src/main/java/com/vaadin/navigator/Navigator.java
@@ -993,6 +993,8 @@ public void removeViewChangeListener(ViewChangeListener listener) {
      * @param state
      *            state string
      * @return suitable provider
+     *
+     * @since 8.0.3
      */
     protected ViewProvider getViewProvider(String state) {
         String longestViewName = null;
diff --git a/server/src/main/java/com/vaadin/server/VaadinServletService.java b/server/src/main/java/com/vaadin/server/VaadinServletService.java
index 242966f8cf4..90328e78d96 100644
--- a/server/src/main/java/com/vaadin/server/VaadinServletService.java
+++ b/server/src/main/java/com/vaadin/server/VaadinServletService.java
@@ -120,6 +120,8 @@ public static String getCancelingRelativePath(String pathToCancel) {
      * @param request
      *            the request for which the location should be determined
      * @return A relative path to the context root. Never ends with a slash (/).
+     *
+     * @since 8.0.3
      */
     public static String getContextRootRelativePath(VaadinRequest request) {
         VaadinServletRequest servletRequest = (VaadinServletRequest) request;
diff --git a/server/src/main/java/com/vaadin/ui/Grid.java b/server/src/main/java/com/vaadin/ui/Grid.java
index 30c49cffa69..5e13075ebed 100644
--- a/server/src/main/java/com/vaadin/ui/Grid.java
+++ b/server/src/main/java/com/vaadin/ui/Grid.java
@@ -1082,6 +1082,8 @@ public Column<T, V> setId(String id) {
          * based on the row item.
          *
          * @return the value provider function
+         *
+         * @since 8.0.3
          */
         public SerializableFunction<T, ? extends V> getValueProvider() {
             return valueProvider;
@@ -1783,6 +1785,8 @@ public <F, C extends HasValue<F> & Component> Column<T, V> setEditorComponent(
          * @param renderer
          *            the new renderer
          * @return this column
+         *
+         * @since 8.0.3
          */
         public Column<T, V> setRenderer(Renderer<? super V> renderer) {
             Objects.requireNonNull(renderer, "Renderer can't be null");
@@ -2126,6 +2130,8 @@ protected Grid(PropertySet<T> propertySet) {
      *
      * @param propertySet
      *            the property set to use
+     *
+     * @since 8.0.3
      */
     protected void setPropertySet(PropertySet<T> propertySet) {
         Objects.requireNonNull(propertySet, "propertySet cannot be null");
@@ -2221,6 +2227,8 @@ public Grid(String caption, Collection<T> items) {
      *
      * @return the used bean type or <code>null</code> if no bean type has been
      *         defined
+     *
+     * @since 8.0.3
      */
     public Class<T> getBeanType() {
         return beanType;
@@ -2344,6 +2352,8 @@ public <V> Column<T, V> addColumn(ValueProvider<T, V> valueProvider,
      * @param renderer
      *            the renderer
      * @return a new column instance
+     *
+     * @since 8.0.3
      */
     protected <V> Column<T, V> createColumn(ValueProvider<T, V> valueProvider,
             AbstractRenderer<? super T, ? super V> renderer) {
@@ -3653,6 +3663,8 @@ protected void doReadDesign(Element design, DesignContext context) {
      *
      * @param beanTypeClassName
      *            the fully qualified class name of the bean type
+     *
+     * @since 8.0.3
      */
     @SuppressWarnings("unchecked")
     protected void setBeanType(String beanTypeClassName) {
@@ -3670,6 +3682,8 @@ protected void setBeanType(String beanTypeClassName) {
      *
      * @param beanType
      *            the bean type class
+     *
+     * @since 8.0.3
      */
     protected void setBeanType(Class<T> beanType) {
         this.beanType = beanType;
diff --git a/server/src/main/java/com/vaadin/ui/components/grid/FooterRow.java b/server/src/main/java/com/vaadin/ui/components/grid/FooterRow.java
index 9a3c1aadb28..25477910fc6 100644
--- a/server/src/main/java/com/vaadin/ui/components/grid/FooterRow.java
+++ b/server/src/main/java/com/vaadin/ui/components/grid/FooterRow.java
@@ -139,6 +139,8 @@ public interface FooterRow extends Serializable {
      * The order of the components in the returned collection is not specified.
      *
      * @return a collection of components in the row
+     *
+     * @since 8.0.3
      */
     public Collection<? extends Component> getComponents();
 
diff --git a/server/src/main/java/com/vaadin/ui/components/grid/HeaderRow.java b/server/src/main/java/com/vaadin/ui/components/grid/HeaderRow.java
index d6c740e7201..c1e551edb62 100644
--- a/server/src/main/java/com/vaadin/ui/components/grid/HeaderRow.java
+++ b/server/src/main/java/com/vaadin/ui/components/grid/HeaderRow.java
@@ -139,6 +139,8 @@ public interface HeaderRow extends Serializable {
      * The order of the components in the returned collection is not specified.
      *
      * @return a collection of components in the row
+     *
+     * @since 8.0.3
      */
     public Collection<? extends Component> getComponents();
 }
diff --git a/server/src/main/java/com/vaadin/ui/renderers/ButtonRenderer.java b/server/src/main/java/com/vaadin/ui/renderers/ButtonRenderer.java
index 40269adb268..f16b3e6e39b 100644
--- a/server/src/main/java/com/vaadin/ui/renderers/ButtonRenderer.java
+++ b/server/src/main/java/com/vaadin/ui/renderers/ButtonRenderer.java
@@ -91,6 +91,8 @@ protected ButtonRendererState getState(boolean markAsDirty) {
      * @param htmlContentAllowed
      *            <code>true</code> to render as HTML, <code>false</code> to
      *            render as text
+     *
+     * @since 8.0.3
      */
     public void setHtmlContentAllowed(boolean htmlContentAllowed) {
         getState().htmlContentAllowed = htmlContentAllowed;
@@ -103,6 +105,8 @@ public void setHtmlContentAllowed(boolean htmlContentAllowed) {
      *
      * @return <code>true</code> if the renderer renders a HTML,
      *         <code>false</code> if the content is rendered as text
+     *
+     * @since 8.0.3
      */
     public boolean isHtmlContentAllowed() {
         return getState(false).htmlContentAllowed;
diff --git a/shared/src/main/java/com/vaadin/shared/VaadinUriResolver.java b/shared/src/main/java/com/vaadin/shared/VaadinUriResolver.java
index 78bf0de598c..5755c686bff 100644
--- a/shared/src/main/java/com/vaadin/shared/VaadinUriResolver.java
+++ b/shared/src/main/java/com/vaadin/shared/VaadinUriResolver.java
@@ -151,6 +151,8 @@ public String resolveVaadinUri(String vaadinUri) {
      * Gets the URL pointing to the context root.
      *
      * @return the context root URL
+     *
+     * @since 8.0.3
      */
     protected abstract String getContextRootUrl();