diff --git a/content/en/docs/releasenotes/marketplace/apd.md b/content/en/docs/releasenotes/marketplace/apd.md
index cd7b9e6a7d5..508cc8517ac 100644
--- a/content/en/docs/releasenotes/marketplace/apd.md
+++ b/content/en/docs/releasenotes/marketplace/apd.md
@@ -3,7 +3,7 @@ title: "APD Release Notes"
 linktitle: "APD"
 url: /releasenotes/marketplace/apd/
 description: "The release notes for Mendix Application Performance Diagnostics (APD) with details on new features, bug fixes, and known issues."
-weight: 10
+weight: 40
 numberless_headings: true
 ---
 
diff --git a/content/en/docs/releasenotes/marketplace/ats.md b/content/en/docs/releasenotes/marketplace/ats.md
index ac6b5c7eef2..a11b87cae8b 100644
--- a/content/en/docs/releasenotes/marketplace/ats.md
+++ b/content/en/docs/releasenotes/marketplace/ats.md
@@ -3,7 +3,7 @@ title: "ATS Release Notes"
 linktitle: "ATS"
 url: /releasenotes/marketplace/ats/
 description: "The release notes for Mendix Application Test Suite (ATS) with details on new features, bug fixes, and known issues."
-weight: 15
+weight: 45
 numberless_headings: true
 ---
 
diff --git a/content/en/docs/releasenotes/marketplace/general-marketplace.md b/content/en/docs/releasenotes/marketplace/general-marketplace.md
deleted file mode 100644
index be3454bc665..00000000000
--- a/content/en/docs/releasenotes/marketplace/general-marketplace.md
+++ /dev/null
@@ -1,639 +0,0 @@
----
-title: "Marketplace Release Notes"
-linktitle: "General Marketplace"
-url: /releasenotes/marketplace/
-description: "Release notes for updates to the Mendix Marketplace"
-weight: 5
-numberless_headings: true
-aliases:
-    - /releasenotes/app-store/index.html
-#This document is mapped to the landing page, update the link there if renaming or moving the doc file
----
-
-These release notes cover changes made to the [Mendix Marketplace](/appstore/).
-
-### December 11, 2025
-
-### New Features
-
-* You can now deprecate Marketplace components that are no longer maintained. This helps keep a clean and reliable Marketplace ecosystem, with full visibility into the content that is no longer supported, as well as its recommended alternatives.    
-  For details, refer to [Deprecating Marketplace Content](/appstore/deprecate-content/).
-
-### October 9, 2025
-
-#### Improvements
-
-We have made several improvements aimed at streamlining the experience of uploading content to the Marketplace and improving quality control:
-
-* The upload flow is now completely revamped, featuring a new interface and additional features, such as:
-
-    * Adding multiple resource links, such as websites, to provide additional information.
-    * Assigning multiple developers from your company as component owners.
-    * Adding support information.
-    * Control over the image size, allowing you to crop screenshots for a better visual experience.
-    * Support for rich text in the release notes field.
-    * A new **Component Tagline** field, allowing you to add a short description that will be displayed on your component's card in the Marketplace.
-    * A new preview page, allowing you to see exactly what the component will look like once published.
-
-* New component versions are now also scanned, and automatically uploaded if no vulnerabilities are found.
-* The email announcing a new version of a component now also includes release notes.
-
-### September 8, 2025
-
-#### Improvements
-
-In an effort to keep the Mendix Marketplace clean, trustworthy, and compliant with open-source standards, we have retired the following components:
-
-* Antd Segmented
-* App Guide  
-* Attribute Helper  
-* Azure Face API  
-* Bootstrap Wysiwyg Editor  
-* Collaboration Portal  
-* Collapsible Header for Mendix Native  
-* Confetti  
-* D3 Matrix  
-* D3 Network  
-* Digital Investment Advice as a Service  
-* Dropbox Connector  
-* Element Animator  
-* eTeller  
-* Expand Text Native (Read More)  
-* Focus Helper  
-* Horizontal Native Chart  
-* Imburse  
-* Inclination Test Preparation  
-* Institutional Onboarding  
-* JavaScript Actions How-To Advanced  
-* JSON To Tree  
-* Konami Code Widget  
-* Lottie Animations  
-* Lottie Animations (Native)  
-* Marine Issue Management  
-* MFI Stencil Management  
-* Multi tenant administration  
-* MxHackathon  
-* Native Calendar  
-* Native Content Renderer  
-* Native Segmented Progress Bar  
-* OAuth  
-* Parallax Header  
-* Ping One Authentication  
-* Planner Widget  
-* PLM, ERP and LAB Connect  
-* Portfolio Manager  
-* Radio Button Native  
-* Senseye Connector  
-* Set Attribute  
-* ShiftSwap  
-* Shrinking header  
-* Skip Link | Skip Navigation | A11Y Widget  
-* Smart Warehousing  
-* Smooth List  
-* Sparklines  
-* StyleSheetSwitcher  
-* SVGRenderer  
-* Tag Selector  
-* Text Template  
-* University - Event App  
-* Vertical Timeline  
-* Workforce Management  
-
-### June 25, 2025
-
-#### New Features
-
-* We have released [Mendix Data Loader](/appstore/modules/snowflake/mendix-data-loader/) version 2.3.0. This version allows you to configure a specific warehouse for your task, which is used as a compute resource when the task triggers data ingestion. This is controlled through two new options: **Use Specific Warehouse** and **Warehouse**.
-
-### June 19, 2025
-
-#### Improvements
-
-* We have redesigned the Studio Pro download page to make it easier for you to identify supported versions and make informed version management decisions at a glance.    
-The new layout prominently displays the latest LTS and MTS releases, allowing you to choose the best version for your production apps. It also includes a definition of each release type to clarify the meaning of the labels in the version table. 
-
-### May 22, 2025
-
-#### Improvements
-
-* We have replaced the [Marketplace Curation](/control-center/marketplace-curation/) <text class="badge badge-pill badge-recommended" style="margin-left:0px">RECOMMENDED</text> label with <text class="badge badge-pill badge-company-approved" style="margin-left:0px"> {{% icon name="checkmark-shield-filled" color="green" %}}COMPANY APPROVED</text>. The new label indicates Marketplace components that meet company policies and guidelines.
-
-### January 16, 2025
-
-#### Improvements
-
-* We have removed outdated components from the Marketplace. These components were no longer supported, actively maintained, or guaranteed to work as intended. This step ensures a more reliable experience for all users.
-
-## 2024
-
-### December 12, 2024
-
-#### Improvements
-
-* Release notes are now editable for all versions of your Marketplace components. You no longer have to reach out to Mendix Support to change them.
-* The Company Subscriptions page has been removed from the Marketplace.
-* The Support Type labels 'Siemens' and 'Partner' have been added to the Marketplace in Studio Pro.
-
-### October 31, 2024
-
-#### New Features
-
-* Components with the content type Solutions or Industry Templates now have a new component details page.
-* On the component details page, you can now view information about the company that owns the component and the industry it belongs to.
-* The **Releases** tab on the component details page now includes two search bars, enabling you to search by release notes and Mendix versions.
-
-#### Improvements
-
-* Videos previously located on the **Documentation** tab have been moved to the **Overview** tab on the component details page.
-* If you click **Start with App** on a component details page of a starter app, you will start the Create App flow.
-
-#### Deprecations
-
-* The content types Banners and Solution Capabilities have been deprecated. You can no longer upload these two content types.
-
-### September 26, 2024
-
-#### New Features
-
-* We added several new features to the Marketplace home page:
-    * You can now search for marketplace content by component name or company name, and apply relevant filters.
-    * Filters can now be easily cleared.
-    * Pagination has been introduced for search results, making navigation more streamlined.
-
-### June 27, 2024
-
-#### New Features
-
-* We released of a new label specifically for React Ready widgets in the Marketplace. This enhancement is designed to help developers and users easily identify and access a wide range of widgets that are optimized for React Client applications. You can find a **React-Client** label next to a version of the product when navigating to the **Release** tab of a product [details page](/appstore/component-details/).
-
-#### Improvements
-
-* We made significant improvements to the [Studio Pro download](https://marketplace.mendix.com/link/studiopro) page. The updated interface now provides a more intuitive and user-friendly experience, making it easier to find and download the latest or previous versions of Studio Pro. Each version of Studio Pro now has its own dedicated page, containing important links such as release notes, release blogs, and all relevant installers.
-* We improved the navigation menus of the [Marketplace home page](/appstore/overview/) to enhance user experience.
-
-### March 7, 2024
-
-#### New Features
-
-This release focuses on improving the Marketplace Reviews feature and making it even better for our users.
-
-* We have improved the **Review** tab to give you tips when writing your review. This feature is available both on the Marketplace site and within Studio Pro.
-* We have decoupled ratings and reviews. You can now rate a component 4 or 5 stars without leaving a review. For 3, 2, and 1 star ratings, a review is mandatory.
-* You can now see additional information, such as reviews, on the Marketplace site without needing to sign in.
-* We have removed the "Company Reviews" page from **Marketplace Home Page**.
-* You can now to filter reviews based on specific criteria.
-* We have improved the **Review** tab to give you tips when replying to a review of your Marketplace component.
-
-## 2023
-
-### November 30, 2023
-
-#### New Features
-
-* We released the [Content API](/apidocs-mxsdk/apidocs/content-api/) for general use. This API allows you to retrieve information about both public and private company-specific Marketplace content.
-
-### September 7, 2023
-
-#### Improvements
-
-In the past, downloading a component directly from the web Marketplace could lead to compatibility errors. Now, downloading a component can only happen directly from the Marketplace in Studio Pro. For that reason, we replaced the **Download** button on the [component details page](/appstore/component-details/) for widgets and modules with the **Use in Studio Pro** button. This new button allows you to copy the content ID so that you can [search for and use the component in Studio Pro](/appstore/use-content/#current-sp). This lowers the risk of introducing compatibility errors and improves the experience of installing the Marketplace content you need.
-
-### August 5, 2023
-
-#### Improvements
-
-* Categories are now **Content Types**. We have reduced the number of content types and made them consistent across the platform. To learn more about the different content types available, visit the [Marketplace Guide](/appstore/overview/).
-* Sub-categories have been replaced with **Categories**. When submitting a new component, you can apply between one and three categories. When searching in the Marketplace, you can use categories to filter the content and find the right component for your use case.
-
-### June 29, 2023
-
-#### New Features
-
-* You can now configure your own [proprietary license](/appstore/submit-content/#proprietary-license) when creating a new public component. The license will be reviewed by Mendix alongside the review of the component. After the license has been approved, you and anyone within your organization can use the license for other components. 
-
-### May 25, 2023
-
-#### New Features
-
-* You can now reassign a draft to yourself if you have edit rights for the Marketplace component. The draft will be unassigned from the previous owner. This allows you to continue working on a Marketplace listing, even when your colleague is out of office.
-
-#### Improvements
-
-* *.mpk* files are now uploaded asynchronously in the flow for adding Marketplace content, which means that you can continue to go through the onboarding wizard while the upload is in progress.
-* We aligned the Marketplace UI with the rest of the Mendix Platform.
-
-#### Fixes
-
-* We fixed an issue with the notifications that are sent when a component update becomes available.
-* If a user's email address contained an upper-case letter, they did not have access to private components in [content groups](/appstore/home-page/#content-groups). This issue has been fixed.
-
-### April 20, 2023
-
-#### New Features
-
-* You can now filter Marketplace content for **Public** or **Private** components via the **Visibility** filter.
-
-#### Improvements
-
-* The **Compatibility** filter now only allows for major Mendix versions.
-* The **Support** section of the [component details page](/appstore/component-details/) now includes a link to [Marketplace Content Support](/appstore/marketplace-content-support/).
-
-### March 23, 2023
-
-#### New Features
-
-On top of open-source community-supported content, we are introducing an additional layer of support through our [Mendix Component Partner program](/appstore/partner-program/). Partner members can now bring their components to the Mendix Marketplace under terms that guarantee full support to customers:
-
-* Partners are free to select an existing open-source license, or they can select a commercial option with the corresponding license and present that.
-* Partners commit to providing support to customers under an SLA (meaning, under terms specified by the partner). Customers can rely on this SLA for support if something goes wrong. A partner-supported [component details page](/appstore/component-details/) contains a reference to the partner's support portal or the partner's support contact email.
-
-You can find and use partner-supported components on the [Marketplace home page](https://marketplace.mendix.com/) under **From our partners** and by selecting the [Partner](/appstore/marketplace-content-support/#category) **Support** level in the search box. A partner-supported component details page has an explicit indicator (a crown), which makes it easy to distinguish from community-supported content.
-
-## 2022
-
-### October 25, 2022
-
-#### New Features
-
-We are excited to bring new changes to the Mendix Marketplace and improve access to Marketplace content in Studio Pro for our community. The new revamp of the Marketplace in Studio Pro presents a better UI with easier navigation, better search functionality, a faster content-discovery experience, and more control over category and filters. We have also included new filter that helps you select **Platform-supported content**. 
-
-The new view helps you to browse through Marketplace components and view component details more quickly, just as you can in the online Marketplace. 
-
-Finally, we introduced UI changes for pagination and points of entry to the Marketplace for a better user experience.
-
-For more information, see [How to Use Marketplace Content](/appstore/use-content/).
-
-{{% alert color="warning" %}}
-If you are using Studio Pro on a Mac with Parallels, see [this update](https://kb.parallels.com/112091#section7) for improving the loading time of Marketplace in Studio Pro.{{% /alert %}}
-
-### August 27, 2022
-
-#### Improvements
-
-* We have added the **My Drafts** page, where you can access component drafts. We have also extended the actions you can perform on drafts. For more information, see the [My Drafts](/appstore/home-page/#my-drafts) section of *Marketplace Home Page*.
-
-### August 11, 2022
-
-#### New Features
-
-* We have introduced a content curation feature, which allows Mendix Admins to curate Marketplace content for Studio. Mendix Admins can do the following from the **Marketplace Content** page in Control Center:
-    * Limit available public Marketplace content in Studio
-    * Approve and hide private Marketplace content in Studio
-
-### March 24, 2022
-
-#### Improvements
-
-* We have made changes related to ad-hoc versioning and are now able to support more flexible version numbers as you create components. This means you can also publish components with version numbers that are backward-compatible.
-
-### February 24, 2022
-
-#### New Features
-
-* There are now user trials available for **Premium** app services, such as Email Service and Speech to Text. This self-service experience helps you to evaluate the capabilities offered with these components and realize the value of premium content.
-* User trial subscriptions are now listed under My Subscriptions, and company trial and paid subscriptions are now listed under Company Subscriptions.
-* For new uploads of public components, you can now optionally share a virus scan report to speed up the governance process.
-* For solutions and solution templates, you can now add a use case relevant to the component. The use case is displayed in the component listing and includes header text and an external link.
-
-#### Improvements
-
-* We made performance improvements for when a large source file is uploaded, specifically on the navigation steps.
-* We improved the UI for self-service uploading your component to the Marketplace.
-
-### February 10, 2022
-
-#### Improvements
-
-* When you onboard a component now, the maximum number of screenshots is restricted to ten.
-* You can use form validations now when you navigate between steps during onboarding.
-
-#### Fixes
-
-* We fixed an issue with the logo cropper. Now the ratio of a cropped image is 600 x 420 pixels.
-
-## 2021
-
-### December 16, 2021
-
-#### Improvements
-
-* We now support using rich text for your [component description](/appstore/submit-content/#general).
-
-### November 18, 2021
-
-#### New Features
-
-* We released **Try for Free** for premium app services (like [Email Service](https://marketplace.mendix.com/link/component/118393)).
-* You can now provide key capabilities, a banner, external links, and industry cloud details when sharing new **Solution** and **Solution Template** [component types](/appstore/submit-content/#adding).
-
-#### Improvements
-
-* You can now add [release notes](/appstore/submit-content/#general) for your new component version without uploading a new source file.
-* You can now skip uploading a source file on the [Upload Component](/appstore/submit-content/#general) tab for **App Service** and **Solution Template** component types if your component is not downloadable.
-
-### September 7, 2021
-
-#### New Features
-
-* Marketplace filtering has been revamped. You can now find content faster by filtering by **Industry**, [Content Type](/appstore/#components-type), and Studio Pro **Compatibility**. 
-* We have made 15+ fully developed solutions and 10+ solution templates available to help you realize value even more quickly.
-* We have listed 10+ **Premium** app services, and we now support a self-service subscription experience using credit card for two app services in supported regions.
-
-### August 12, 2021
-
-#### Improvements
-
-* We have replaced the **Download** button with the **Start with Template** button for the **Create New App** category.
-
-### July 29, 2021
-
-#### New Features
-
-* We have implemented a UX refresh of **Marketplace Home Page** to be in line with other Marketplace pages.
-
-### June 3, 2021
-
-#### Fixes
-
-* We fixed a bug in Studio Pro where certain components did not load properly.
-
-### May 31, 2021
-
-#### Improvements
-
-* When [adding new Marketplace content](/appstore/submit-content/#adding), you can now only set the **Category** in the initial version of your content. You cannot change this setting by updating the content later.
-* When you create a new component in the **Solutions** category, you will not be able to upload a source file, as solutions will no longer have downloadable content.
-* We have started supporting rich characters in the message describing what needs to be changed in your content for approval via the steps on the [Publish](/appstore/submit-content/#publish) page.
-
-#### Fixes
-
-* We fixed some bugs in the flow for adding new Marketplace content.
-
-### May 28, 2021
-
-#### New Features
-
-* We released support for the subscription to an app service (like *MindSphere IIoT for Makers*):
-    * Automatic provisioning of the app service on subscription.
-    * The Service Management Dashboard, where you can view the service instance to which you have subscribed and generate binding keys for your service instance.
-
-### May 4, 2021
-
-#### Fixes
-
-* <a id="windows-service"></a>We fixed the issue with downloading the Windows Service. 
-* We fixed a minor bug for anonymous users.
-
-### April 7, 2021
-
-#### Improvements
-
-* We added a section to **Get Studio Pro** for downloading versions that have [long-term support (LTS)](/releasenotes/studio-pro/lts-mts/#lts) and [medium-term support (MTS)](/releasenotes/studio-pro/lts-mts/#mts).
-
-    {{% alert color="info" %}}This is based on an [upvoted idea from Alexander Keßler](https://community.mendix.com/link/ideas/2212) submitted to the [Mendix Community](https://community.mendix.com/link/ideas). Thanks, Alexander!{{% /alert %}}
-
-#### Fixes
-
-* We fixed some performance issues where certain Marketplace sections were not loading properly. This also includes connection issues to the Marketplace within Studio Pro.
-
-#### Known Issues
-
-* There is an issue with users having trouble downloading Windows Service.
-    * Fixed on [May 4th, 2021](#windows-service).
-
-### March 23, 2021
-
-#### Improvements
-
-* We added email notifications for several actions in the Marketplace. You can now receive emails if one of your components has changed, when a published component has received a review, and when you receive a reply to one of your reviews. You can unsubscribe from any of the notifications in **Marketplace Home Page**.
-* Developers can now reply to reviews of their components.
-
-### February 9, 2021
-
-#### Improvements
-
-* You can now download [Windows Service](/releasenotes/studio-pro/windows-service/) and **Server Distribution** for the latest Studio Pro version using the **Related Downloads** button on the **Get Studio Pro** page.  
-* Adding beta versions for components is no longer supported. Beta versions of published components and existing drafts have been automatically updated to remove the beta tag.
-
-### January 26, 2021
-
-#### Improvements
-
-* You are now able to download Studio Pro versions marked as [beta](/releasenotes/release-status/) from a separate tab on the **Get Studio Pro** page named **Beta Releases**. The default download option (via the **Release Notes** tab) remains the latest stable release of Studio Pro.
-
-#### Fixes
-
-* We fixed some bugs in the [add new Marketplace content](/appstore/submit-content/#adding) flow and we made error messages more descriptive.
-
-## 2020
-
-### December 15, 2020
-
-#### Improvements
-
-* The Mendix "App Store" has been renamed to the "Marketplace" as part of the continued investment in new capabilities that is underway. This rename (and URL change) is only for the pages rebuilt so far listed above. Further implementation of this renaming is to follow in future releases.
-* We have implemented a UX Refresh to provide a fresh new look and feel for the [Marketplace home](/appstore/overview/), [catalog](/appstore/overview/), [component details](/appstore/component-details/), and Studio Pro download pages.
-* We have enabled an enhanced navigation and undertaken some curation of published components to help you discover the components you require more easily.
-* We have enabled a more structured wizard-based flow that makes it a lot easier for you to [share new content](/appstore/submit-content/) to the Marketplace.
-
-### May 27, 2020
-
-#### Fixes
-
-* As of Studio Pro [8.10.0](/releasenotes/studio-pro/8.10/#1400), you are able to download private content in the App Store again. This is not possible for Studio Pro 8.7 to 8.9.
-
-### May 6, 2020
-
-#### Improvements
-
-* You can now download previous versions of App Store components from the [Mendix Marketplace](https://marketplace.mendix.com/). This can be done in the **All versions** tab on the component's [details page](/appstore/component-details/). This can be used as a workaround for not being able to download private content from the App Store available in older versions of Studio Pro/Desktop Modeler due to the [security issue](#private-fix) described below.
-
-#### Fixes
-
-* As of Studio Pro [8.6.4](/releasenotes/studio-pro/8.6/#private-content), you are able to download private content in the App Store again. This is possible for Studio Pro 8.6.4 and all further 8.6.x versions. It is not possible for Studio Pro versions below 8.6.4.
-
-### May 4, 2020
-
-#### Fixes
-
-* As of Desktop Modeler version 7.23.14, you are able to download private content in the App Store again. This is possible for Desktop Modeler version 7.23.14 and all further 7.23.x versions. It is not possible for Desktop Modeler versions below 7.23.14.
-
-### April 7, 2020
-
-#### Fixes {#private-fix}
-
-* Downloading private content from the App Store available in Studio Pro/Desktop Modeler has been temporarily disabled due to a security vulnerability.
-    * You will be able to download private content from the App Store available in Studio Pro/Desktop Modeler again once a fix is released in a future [8.x](/releasenotes/studio-pro/8/), [8.6.x](/releasenotes/studio-pro/8.6/), and 7.23.x release. This functionality will then only be available in those specific versions with the fix and subsequent versions. This functionality will not be available again for the App Store in Desktop Modeler version 6.
-    * You can continue downloading the latest version of private App Store content from the [Company Content](/appstore/home-page/#company-content) page in the [Mendix Marketplace](https://marketplace.mendix.com/) and use it in the respective versions of Studio Pro/Desktop Modeler.
-
-### February 26, 2020
-
-#### Improvements
-
-* We have updated the single sign-on functionality in the App Store to use the latest [Mendix SSO](/developerportal/deploy/mendix-sso/). Now, the first time you visit any App Store page requiring authentication, you will see a screen asking you to authorize access to your Mendix account. Click **Authorize** to continue.
-
-## 2019
-
-### November 14, 2019
-
-#### Improvements
-
-We are invested in maintaining Mendix Marketplace content to make it easier for you to find and use the widgets and modules that you need. To that end, we have cleaned up old App Store content where Mendix support is no longer possible and changed the support level from **Platform support** to **Community support**.
-
-For more information on these support levels, see the [Marketplace Content Support](/appstore/marketplace-content-support/) section of *Marketplace Overview*.
-
-### November 6, 2019
-
-#### Improvements
-
-* You can now subscribe to receive emails when new versions of your favorite App Store content are published.
-
-### October 23, 2019
-
-#### New Features
-
-You can now create [user groups](/appstore/home-page/#content-groups) for your company and assign your company’s App Store content to different groups. Management of user group content is restricted to only the members of the group. You can also add [guest](/appstore/home-page/#guests) users to these groups and allow them to download selected private company content.
-
-The former App Store **Content Managers** and **External Downloaders** groups have been removed. Members of these groups have been migrated to a new temporary user group called **Migrated Data**. Former “content managers” have been added as user group [members](/appstore/home-page/#members), and former “external downloaders” have been added as [guests](/appstore/home-page/#guests).
-
-Content that was marked as **Protected** as well as content marked as **Shared with Others** has been migrated to the [Content](/appstore/home-page/#group-content) tab of the Migrated Data user group. This makes all “externally shared” content protected for that user group.
-
-### October 1, 2019
-
-#### Improvements
-
-* We now display the UUID of an App Store component in the **Usage** section of its details page.
-
-### September 11, 2019
-
-#### Improvements
-
-We added the flexibility to label your App Store content with a [custom version number](/appstore/submit-content/#updating).
-
-{{% alert color="info" %}}This is based on an [upvoted idea from Andreas Blaesius](https://community.mendix.com/link/ideas/1324) submitted to the [Mendix Community](https://community.mendix.com/). Thanks, Andreas!{{% /alert %}}
-
-### August 30, 2019
-
-#### Improvements
-
-We renamed all the SAP-related connectors and app templates in the App Store to be consistent. The changes are:
-
-| Type | Old Name | New Name |
-| ----- | ----- | -----|
-| Connector | SAP Cloud Platform XSUAA Connector | XSUAA Connector for SAP Business Technology Platform |
-| Connector | SAP Fiori UI Package | UI Package for SAP Fiori themed apps |
-| Connector | SAP Leonardo Machine Learning Foundation Connector | Connector for SAP Leonardo Machine Learning Foundation |
-| Connector | SAP OData Connector | OData Connector for SAP solutions |
-| Connector | SAP OData Model Creator | OData Model Creator for SAP solutions |
-| App Template | Fiori Blank | Blank App for SAP Fiori themed apps |
-| App Template | SAP Northwind OData | Northwind OData Service Master-Detail App for SAP solutions |
-| App Template | SAP Purchase Order Approval Tutorial | Purchase Order Approval Tutorial for SAP solutions |
-
-### August 26, 2019
-
-#### Improvements
-
-* We updated the **SAP OData Connector** to support the **Edm.Int64** data type. (Ticket 87284)
-
-#### Fixes
-
-* We also fixed a *java.net.SocketException: Broken pipe (Write failed)* exception which occurred when sending a large request to the OData service endpoint. (Ticket 86680)
-
-### July 31, 2019  
-
-#### Improvements 
-
-* We simplified the options available for formatting the Documentation section when creating new App Store content.
-* We made it possible to upload images into the Documentation editor - you can drag an image from your file explorer into the editor, or link to images via URL (Copy + Paste does *not* work due to browser inconsistencies).
-* We made some user changes and improvements when you create new content using GitHub as the source. For example, an easier-to-use selection screen when choosing your repository.  
-* We also made some other minor bug fixes. 
-
-### July 5, 2019
-
-#### Improvements
-
-* We updated the **SAP Logging Connector** to allow the log level to be set via a constant instead of an enumeration. This means that you can change the log level with a restart, without needing to fully redeploy your app.
-* We solved an issue where the SAP Logging Connector had conflicts with the Community Commons module.
-
-### June 28, 2019
-
-#### Improvements
-
-We added a component in the App Store which, when configured in your app, allows you to use the logging format supported by SAP Kibana. For more information, see [SAP Logging Connector](/appstore/modules/sap/sap-logger/).
-
-### June 6, 2019
-
-#### Improvements
-
-* We fixed the issue with selecting specific app templates when creating a new app in Mendix Studio Pro (Desktop Modeler).
-* We fixed the problems with deep links for private apps.
-
-### April 29, 2019
-
-#### Improvements
-
-* We created a new App Store menu structure, so it is now easier to navigate through your created content. If you are a Mendix Admin with certain permissions, you will see additional menu items to help you manage private and public company content.
-* For App Store administrators, you can now set content managers who are allowed to manage your company content by marking it as protected.
-* You can now share private App Store content with external downloaders from other companies.
-
-### February 15, 2019
-
-#### Improvements 
-
-* We now throw an error which you can catch in a microflow if the destination does not exist, or the app is running locally. Previously the error could not be caught.
-* We now provide OData Connector support for Mendix apps which use Oracle DB as their database.
-* We fixed some typos in the OData Connector actions.
-
-### January 24, 2019
-
-#### Improvements
-
-* We released an upgraded version of the IBM Watson Connector Suite, which supports IBM Watson SDK version 6.11.0 and adds additional microflow actions.
-* We released an upgraded version of the IBM Watson Connector Suite Example Project, which includes the new IBM Watson Connector Suite.
-* We released an upgraded version of the IBM Watson Blank App app template, which includes the new IBM Watson Connector Suite.
-
-### January 21, 2019
-
-#### Fixes
-
-The **Reviews** section at the bottom of the [App Store main page](https://marketplace.mendix.com/) presents the latest published user reviews. We fixed an issue where clicking on a user's name to view their profile caused an internal server error. You will now be redirected to the expected user.
-
-## 2018
-
-### December 17, 2018
-
-#### Improvements
-
-We have noticed that when searching in the App Store (via the **Search Mendix** search bar), users frequently use keywords like **Mendix**, **Modeler**, **Desktop**, and **Download** as well as different Desktop Modeler versions. The search results did not provide the expected results based on these keywords (as in, they did not show the Modeler download page). With this update, it is now possible to search for the Modeler and all of its versions in the **Search Mendix** search bar, which will redirect you to the [Desktop Modeler page](https://marketplace.mendix.com/link/studiopro/) in the Mendix Marketplace.
-
-### October 1, 2018
-
-#### SAP OData Connector 4.0
-
- This version of the [SAP OData Connector](https://marketplace.mendix.com/link/component/74525/) allows you to use the destination services of SAP Cloud Platform. This simplifies configuration, authentication and endpoint management when integrating your application, running in SAP Cloud Platform, with SAP back end services. See [SAP Destination Service](/developerportal/deploy/sap-cloud-platform/sap-destination-service/).
-
-The following authentication types are currently supported in SAP Destination Services:
-
-* PrincipalPropagation authentication and ProxyType on-premise (Connectivity Service/Cloud Connector/On premise back end)
-* Oauth2SALMAssertion authentication (For Neo Platform apps)
-* Basic and None authentication for public back ends
-
-#### SAP Leonardo Machine Learning Foundation Connector Version 1.0.0
-
-This new connector allows you to consume Leonardo Machine learning services from both API Business Hub and SAP Cloud Platform by adding activities to your Mendix model.
-
-The SAP Leonardo Machine Learning Foundation Connector is available in the App Store here: https://marketplace.mendix.com/link/component/107221/.
-
-#### SAP Fiori Styling
-
-The existing SAP Blank app template has been replaced by a new Fiori Blank app template. This new Fiori Blank app template has a new Fiori UI Package included. This is based on Atlas UI, which means that you can use either the Web Modeler or Desktop Modeler to build applications which give the SAP Fiori UI experience.
-
-#### Breaking Changes
-
-The new **SAP OData Connector** will break existing projects which are using the SAP Cloud Connector. The SAP OData Connector no longer supports the “Use Cloud Connector” attribute. This is now embedded in the destination service configuration. See [SAP Destination Service](/developerportal/deploy/sap-cloud-platform/sap-destination-service/) for more details.
-
-## 2017
-
-### June 21, 2017
-
-* Private company App Store content is now indicated in the **Template** browser with a lock icon.
diff --git a/content/en/docs/releasenotes/marketplace/general-marketplace/2017.md b/content/en/docs/releasenotes/marketplace/general-marketplace/2017.md
new file mode 100644
index 00000000000..df3d5a2fbd0
--- /dev/null
+++ b/content/en/docs/releasenotes/marketplace/general-marketplace/2017.md
@@ -0,0 +1,16 @@
+---
+title: "2017 Marketplace Release Notes"
+linktitle: "2017"
+url: /releasenotes/marketplace/2017/
+description: "2017 release notes for Marketplace"
+weight: 9
+numberless_headings: true
+---
+
+## June 2017
+
+### June 21, 2017
+
+#### New Features
+
+* Private company App Store content is now indicated in the **Template** browser with a lock icon.
\ No newline at end of file
diff --git a/content/en/docs/releasenotes/marketplace/general-marketplace/2018.md b/content/en/docs/releasenotes/marketplace/general-marketplace/2018.md
new file mode 100644
index 00000000000..a614b5886c1
--- /dev/null
+++ b/content/en/docs/releasenotes/marketplace/general-marketplace/2018.md
@@ -0,0 +1,45 @@
+---
+title: "2018 Marketplace Release Notes"
+linktitle: "2018"
+url: /releasenotes/marketplace/2018/
+description: "2018 release notes for Marketplace"
+weight: 8
+numberless_headings: true
+---
+
+## December 2018
+
+### December 17, 2018
+
+#### Improvements
+
+We have noticed that when searching in the App Store (via the **Search Mendix** search bar), users frequently use keywords like **Mendix**, **Modeler**, **Desktop**, and **Download** as well as different Desktop Modeler versions. The search results did not provide the expected results based on these keywords (as in, they did not show the Modeler download page). With this update, it is now possible to search for the Modeler and all of its versions in the **Search Mendix** search bar, which will redirect you to the [Desktop Modeler page](https://marketplace.mendix.com/link/studiopro/) in the Mendix Marketplace.
+
+## October 2018
+
+### October 1, 2018
+
+#### SAP OData Connector 4.0
+
+ This version of the [SAP OData Connector](https://marketplace.mendix.com/link/component/74525/) allows you to use the destination services of SAP Cloud Platform. This simplifies configuration, authentication and endpoint management when integrating your application, running in SAP Cloud Platform, with SAP back end services. See [SAP Destination Service](/developerportal/deploy/sap-cloud-platform/sap-destination-service/).
+
+The following authentication types are currently supported in SAP Destination Services:
+
+* PrincipalPropagation authentication and ProxyType on-premise (Connectivity Service/Cloud Connector/On premise back end)
+* Oauth2SALMAssertion authentication (For Neo Platform apps)
+* Basic and None authentication for public back ends
+
+#### SAP Leonardo Machine Learning Foundation Connector Version 1.0.0
+
+This new connector allows you to consume Leonardo Machine learning services from both API Business Hub and SAP Cloud Platform by adding activities to your Mendix model.
+
+The SAP Leonardo Machine Learning Foundation Connector is available in the App Store here: https://marketplace.mendix.com/link/component/107221/.
+
+#### SAP Fiori Styling
+
+The existing SAP Blank app template has been replaced by a new Fiori Blank app template. This new Fiori Blank app template has a new Fiori UI Package included. This is based on Atlas UI, which means that you can use either the Web Modeler or Desktop Modeler to build applications which give the SAP Fiori UI experience.
+
+#### Breaking Changes
+
+The new **SAP OData Connector** will break existing projects which are using the SAP Cloud Connector. The SAP OData Connector no longer supports the “Use Cloud Connector” attribute. This is now embedded in the destination service configuration. See [SAP Destination Service](/developerportal/deploy/sap-cloud-platform/sap-destination-service/) for more details.
+
diff --git a/content/en/docs/releasenotes/marketplace/general-marketplace/2019.md b/content/en/docs/releasenotes/marketplace/general-marketplace/2019.md
new file mode 100644
index 00000000000..1e0d770e13a
--- /dev/null
+++ b/content/en/docs/releasenotes/marketplace/general-marketplace/2019.md
@@ -0,0 +1,150 @@
+---
+title: "2019 Marketplace Release Notes"
+linktitle: "2019"
+url: /releasenotes/marketplace/2019/
+description: "2019 release notes for Marketplace"
+weight: 7
+numberless_headings: true
+---
+
+## November 2019
+
+### November 14, 2019
+
+#### Improvements
+
+We are invested in maintaining Mendix Marketplace content to make it easier for you to find and use the widgets and modules that you need. To that end, we have cleaned up old App Store content where Mendix support is no longer possible and changed the support level from **Platform support** to **Community support**.
+
+For more information on these support levels, see the [Marketplace Content Support](/appstore/marketplace-content-support/) section of *Marketplace Overview*.
+
+### November 6, 2019
+
+#### Improvements
+
+* You can now subscribe to receive emails when new versions of your favorite App Store content are published.
+
+## October 2019
+
+### October 23, 2019
+
+#### New Features
+
+You can now create [user groups](/appstore/home-page/#content-groups) for your company and assign your company’s App Store content to different groups. Management of user group content is restricted to only the members of the group. You can also add [guest](/appstore/home-page/#guests) users to these groups and allow them to download selected private company content.
+
+The former App Store **Content Managers** and **External Downloaders** groups have been removed. Members of these groups have been migrated to a new temporary user group called **Migrated Data**. Former “content managers” have been added as user group [members](/appstore/home-page/#members), and former “external downloaders” have been added as [guests](/appstore/home-page/#guests).
+
+Content that was marked as **Protected** as well as content marked as **Shared with Others** has been migrated to the [Content](/appstore/home-page/#group-content) tab of the Migrated Data user group. This makes all “externally shared” content protected for that user group.
+
+### October 1, 2019
+
+#### Improvements
+
+* We now display the UUID of an App Store component in the **Usage** section of its details page.
+
+## September 2019
+
+### September 11, 2019
+
+#### Improvements
+
+We added the flexibility to label your App Store content with a [custom version number](/appstore/submit-content/#updating).
+
+{{% alert color="info" %}}This is based on an [upvoted idea from Andreas Blaesius](https://community.mendix.com/link/ideas/1324) submitted to the [Mendix Community](https://community.mendix.com/). Thanks, Andreas!{{% /alert %}}
+
+## August 2019
+
+### August 30, 2019
+
+#### Improvements
+
+We renamed all the SAP-related connectors and app templates in the App Store to be consistent. The changes are:
+
+| Type | Old Name | New Name |
+| ----- | ----- | -----|
+| Connector | SAP Cloud Platform XSUAA Connector | XSUAA Connector for SAP Business Technology Platform |
+| Connector | SAP Fiori UI Package | UI Package for SAP Fiori themed apps |
+| Connector | SAP Leonardo Machine Learning Foundation Connector | Connector for SAP Leonardo Machine Learning Foundation |
+| Connector | SAP OData Connector | OData Connector for SAP solutions |
+| Connector | SAP OData Model Creator | OData Model Creator for SAP solutions |
+| App Template | Fiori Blank | Blank App for SAP Fiori themed apps |
+| App Template | SAP Northwind OData | Northwind OData Service Master-Detail App for SAP solutions |
+| App Template | SAP Purchase Order Approval Tutorial | Purchase Order Approval Tutorial for SAP solutions |
+
+### August 26, 2019
+
+#### Improvements
+
+* We updated the **SAP OData Connector** to support the **Edm.Int64** data type. (Ticket 87284)
+
+#### Fixes
+
+* We also fixed a *java.net.SocketException: Broken pipe (Write failed)* exception which occurred when sending a large request to the OData service endpoint. (Ticket 86680)
+
+## July 2019
+
+### July 31, 2019  
+
+#### Improvements 
+
+* We simplified the options available for formatting the Documentation section when creating new App Store content.
+* We made it possible to upload images into the Documentation editor - you can drag an image from your file explorer into the editor, or link to images via URL (Copy + Paste does *not* work due to browser inconsistencies).
+* We made some user changes and improvements when you create new content using GitHub as the source. For example, an easier-to-use selection screen when choosing your repository.  
+* We also made some other minor bug fixes. 
+
+### July 5, 2019
+
+#### Improvements
+
+* We updated the **SAP Logging Connector** to allow the log level to be set via a constant instead of an enumeration. This means that you can change the log level with a restart, without needing to fully redeploy your app.
+* We solved an issue where the SAP Logging Connector had conflicts with the Community Commons module.
+
+## June 2019
+
+### June 28, 2019
+
+#### Improvements
+
+We added a component in the App Store which, when configured in your app, allows you to use the logging format supported by SAP Kibana. For more information, see [SAP Logging Connector](/appstore/modules/sap/sap-logger/).
+
+### June 6, 2019
+
+#### Improvements
+
+* We fixed the issue with selecting specific app templates when creating a new app in Mendix Studio Pro (Desktop Modeler).
+* We fixed the problems with deep links for private apps.
+
+## April 2019
+
+### April 29, 2019
+
+#### Improvements
+
+* We created a new App Store menu structure, so it is now easier to navigate through your created content. If you are a Mendix Admin with certain permissions, you will see additional menu items to help you manage private and public company content.
+* For App Store administrators, you can now set content managers who are allowed to manage your company content by marking it as protected.
+* You can now share private App Store content with external downloaders from other companies.
+
+## February 2019
+
+### February 15, 2019
+
+#### Improvements 
+
+* We now throw an error which you can catch in a microflow if the destination does not exist, or the app is running locally. Previously the error could not be caught.
+* We now provide OData Connector support for Mendix apps which use Oracle DB as their database.
+* We fixed some typos in the OData Connector actions.
+
+## January 2019
+
+### January 24, 2019
+
+#### Improvements
+
+* We released an upgraded version of the IBM Watson Connector Suite, which supports IBM Watson SDK version 6.11.0 and adds additional microflow actions.
+* We released an upgraded version of the IBM Watson Connector Suite Example Project, which includes the new IBM Watson Connector Suite.
+* We released an upgraded version of the IBM Watson Blank App app template, which includes the new IBM Watson Connector Suite.
+
+### January 21, 2019
+
+#### Fixes
+
+The **Reviews** section at the bottom of the [App Store main page](https://marketplace.mendix.com/) presents the latest published user reviews. We fixed an issue where clicking on a user's name to view their profile caused an internal server error. You will now be redirected to the expected user.
diff --git a/content/en/docs/releasenotes/marketplace/general-marketplace/2020.md b/content/en/docs/releasenotes/marketplace/general-marketplace/2020.md
new file mode 100644
index 00000000000..4315fcdc13f
--- /dev/null
+++ b/content/en/docs/releasenotes/marketplace/general-marketplace/2020.md
@@ -0,0 +1,61 @@
+---
+title: "2020 Marketplace Release Notes"
+linktitle: "2020"
+url: /releasenotes/marketplace/2020/
+description: "2020 release notes for Marketplace"
+weight: 6
+numberless_headings: true
+---
+
+## December 2020
+
+### December 15, 2020
+
+#### Improvements
+
+* The Mendix "App Store" has been renamed to the "Marketplace" as part of the continued investment in new capabilities that is underway. This rename (and URL change) is only for the pages rebuilt so far listed above. Further implementation of this renaming is to follow in future releases.
+* We have implemented a UX Refresh to provide a fresh new look and feel for the [Marketplace home](/appstore/overview/), [catalog](/appstore/overview/), [component details](/appstore/component-details/), and Studio Pro download pages.
+* We have enabled an enhanced navigation and undertaken some curation of published components to help you discover the components you require more easily.
+* We have enabled a more structured wizard-based flow that makes it a lot easier for you to [share new content](/appstore/submit-content/) to the Marketplace.
+
+## May 2020
+
+### May 27, 2020
+
+#### Fixes
+
+* As of Studio Pro [8.10.0](/releasenotes/studio-pro/8.10/#1400), you are able to download private content in the App Store again. This is not possible for Studio Pro 8.7 to 8.9.
+
+### May 6, 2020
+
+#### Improvements
+
+* You can now download previous versions of App Store components from the [Mendix Marketplace](https://marketplace.mendix.com/). This can be done in the **All versions** tab on the component's [details page](/appstore/component-details/). This can be used as a workaround for not being able to download private content from the App Store available in older versions of Studio Pro/Desktop Modeler due to the [security issue](#private-fix) described below.
+
+#### Fixes
+
+* As of Studio Pro [8.6.4](/releasenotes/studio-pro/8.6/#private-content), you are able to download private content in the App Store again. This is possible for Studio Pro 8.6.4 and all further 8.6.x versions. It is not possible for Studio Pro versions below 8.6.4.
+
+### May 4, 2020
+
+#### Fixes
+
+* As of Desktop Modeler version 7.23.14, you are able to download private content in the App Store again. This is possible for Desktop Modeler version 7.23.14 and all further 7.23.x versions. It is not possible for Desktop Modeler versions below 7.23.14.
+
+## April 2020
+
+### April 7, 2020
+
+#### Fixes {#private-fix}
+
+* Downloading private content from the App Store available in Studio Pro/Desktop Modeler has been temporarily disabled due to a security vulnerability.
+    * You will be able to download private content from the App Store available in Studio Pro/Desktop Modeler again once a fix is released in a future [8.x](/releasenotes/studio-pro/8/), [8.6.x](/releasenotes/studio-pro/8.6/), and 7.23.x release. This functionality will then only be available in those specific versions with the fix and subsequent versions. This functionality will not be available again for the App Store in Desktop Modeler version 6.
+    * You can continue downloading the latest version of private App Store content from the [Company Content](/appstore/home-page/#company-content) page in the [Mendix Marketplace](https://marketplace.mendix.com/) and use it in the respective versions of Studio Pro/Desktop Modeler.
+
+## February 2020
+
+### February 26, 2020
+
+#### Improvements
+
+* We have updated the single sign-on functionality in the App Store to use the latest [Mendix SSO](/developerportal/deploy/mendix-sso/). Now, the first time you visit any App Store page requiring authentication, you will see a screen asking you to authorize access to your Mendix account. Click **Authorize** to continue.
diff --git a/content/en/docs/releasenotes/marketplace/general-marketplace/2021.md b/content/en/docs/releasenotes/marketplace/general-marketplace/2021.md
new file mode 100644
index 00000000000..a2199d3c4b1
--- /dev/null
+++ b/content/en/docs/releasenotes/marketplace/general-marketplace/2021.md
@@ -0,0 +1,142 @@
+---
+title: "2021 Marketplace Release Notes"
+linktitle: "2021"
+url: /releasenotes/marketplace/2021/
+description: "2021 release notes for Marketplace"
+weight: 5
+numberless_headings: true
+---
+
+## December 2021
+
+### December 16, 2021
+
+#### Improvements
+
+* We now support using rich text for your [component description](/appstore/submit-content/#general).
+
+## November 2021
+
+### November 18, 2021
+
+#### New Features
+
+* We released **Try for Free** for premium app services (like [Email Service](https://marketplace.mendix.com/link/component/118393)).
+* You can now provide key capabilities, a banner, external links, and industry cloud details when sharing new **Solution** and **Solution Template** [component types](/appstore/submit-content/#adding).
+
+#### Improvements
+
+* You can now add [release notes](/appstore/submit-content/#general) for your new component version without uploading a new source file.
+* You can now skip uploading a source file on the [Upload Component](/appstore/submit-content/#general) tab for **App Service** and **Solution Template** component types if your component is not downloadable.
+
+## September 2021
+
+### September 7, 2021
+
+#### New Features
+
+* Marketplace filtering has been revamped. You can now find content faster by filtering by **Industry**, [Content Type](/appstore/#components-type), and Studio Pro **Compatibility**. 
+* We have made 15+ fully developed solutions and 10+ solution templates available to help you realize value even more quickly.
+* We have listed 10+ **Premium** app services, and we now support a self-service subscription experience using credit card for two app services in supported regions.
+
+## August 2021
+
+### August 12, 2021
+
+#### Improvements
+
+* We have replaced the **Download** button with the **Start with Template** button for the **Create New App** category.
+
+## July 2021
+
+### July 29, 2021
+
+#### New Features
+
+* We have implemented a UX refresh of **Marketplace Home Page** to be in line with other Marketplace pages.
+
+## June 2021
+
+### June 3, 2021
+
+#### Fixes
+
+* We fixed a bug in Studio Pro where certain components did not load properly.
+
+## May 2021
+
+### May 31, 2021
+
+#### Improvements
+
+* When [adding new Marketplace content](/appstore/submit-content/#adding), you can now only set the **Category** in the initial version of your content. You cannot change this setting by updating the content later.
+* When you create a new component in the **Solutions** category, you will not be able to upload a source file, as solutions will no longer have downloadable content.
+* We have started supporting rich characters in the message describing what needs to be changed in your content for approval via the steps on the [Publish](/appstore/submit-content/#publish) page.
+
+#### Fixes
+
+* We fixed some bugs in the flow for adding new Marketplace content.
+
+### May 28, 2021
+
+#### New Features
+
+* We released support for the subscription to an app service (like *MindSphere IIoT for Makers*):
+    * Automatic provisioning of the app service on subscription.
+    * The Service Management Dashboard, where you can view the service instance to which you have subscribed and generate binding keys for your service instance.
+
+### May 4, 2021
+
+#### Fixes
+
+* <a id="windows-service"></a>We fixed the issue with downloading the Windows Service. 
+* We fixed a minor bug for anonymous users.
+
+## April 2021
+
+### April 7, 2021
+
+#### Improvements
+
+* We added a section to **Get Studio Pro** for downloading versions that have [long-term support (LTS)](/releasenotes/studio-pro/lts-mts/#lts) and [medium-term support (MTS)](/releasenotes/studio-pro/lts-mts/#mts).
+
+    {{% alert color="info" %}}This is based on an [upvoted idea from Alexander Keßler](https://community.mendix.com/link/ideas/2212) submitted to the [Mendix Community](https://community.mendix.com/link/ideas). Thanks, Alexander!{{% /alert %}}
+
+#### Fixes
+
+* We fixed some performance issues where certain Marketplace sections were not loading properly. This also includes connection issues to the Marketplace within Studio Pro.
+
+#### Known Issues
+
+* There is an issue with users having trouble downloading Windows Service.
+    * Fixed on [May 4th, 2021](#windows-service).
+
+## March 2021
+
+### March 23, 2021
+
+#### Improvements
+
+* We added email notifications for several actions in the Marketplace. You can now receive emails if one of your components has changed, when a published component has received a review, and when you receive a reply to one of your reviews. You can unsubscribe from any of the notifications in **Marketplace Home Page**.
+* Developers can now reply to reviews of their components.
+
+## February 2021
+
+### February 9, 2021
+
+#### Improvements
+
+* You can now download [Windows Service](/releasenotes/studio-pro/windows-service/) and **Server Distribution** for the latest Studio Pro version using the **Related Downloads** button on the **Get Studio Pro** page.  
+* Adding beta versions for components is no longer supported. Beta versions of published components and existing drafts have been automatically updated to remove the beta tag.
+
+## January 2021
+
+### January 26, 2021
+
+#### Improvements
+
+* You are now able to download Studio Pro versions marked as [beta](/releasenotes/release-status/) from a separate tab on the **Get Studio Pro** page named **Beta Releases**. The default download option (via the **Release Notes** tab) remains the latest stable release of Studio Pro.
+
+#### Fixes
+
+* We fixed some bugs in the [add new Marketplace content](/appstore/submit-content/#adding) flow and we made error messages more descriptive.
diff --git a/content/en/docs/releasenotes/marketplace/general-marketplace/2022.md b/content/en/docs/releasenotes/marketplace/general-marketplace/2022.md
new file mode 100755
index 00000000000..9ccfc0257cc
--- /dev/null
+++ b/content/en/docs/releasenotes/marketplace/general-marketplace/2022.md
@@ -0,0 +1,76 @@
+---
+title: "2022 Marketplace Release Notes"
+linktitle: "2022"
+url: /releasenotes/marketplace/2022/
+description: "2022 release notes for Marketplace"
+weight: 4
+numberless_headings: true
+---
+
+## October 2022
+
+### October 25, 2022
+
+#### New Features
+
+We are excited to bring new changes to the Mendix Marketplace and improve access to Marketplace content in Studio Pro for our community. The new revamp of the Marketplace in Studio Pro presents a better UI with easier navigation, better search functionality, a faster content-discovery experience, and more control over category and filters. We have also included new filter that helps you select **Platform-supported content**. 
+
+The new view helps you to browse through Marketplace components and view component details more quickly, just as you can in the online Marketplace. 
+
+Finally, we introduced UI changes for pagination and points of entry to the Marketplace for a better user experience.
+
+For more information, see [How to Use Marketplace Content](/appstore/use-content/).
+
+{{% alert color="warning" %}}
+If you are using Studio Pro on a Mac with Parallels, see [this update](https://kb.parallels.com/112091#section7) for improving the loading time of Marketplace in Studio Pro.{{% /alert %}}
+
+## August 2022
+
+### August 27, 2022
+
+#### Improvements
+
+* We have added the **My Drafts** page, where you can access component drafts. We have also extended the actions you can perform on drafts. For more information, see the [My Drafts](/appstore/home-page/#my-drafts) section of *Marketplace Home Page*.
+
+### August 11, 2022
+
+#### New Features
+
+* We have introduced a content curation feature, which allows Mendix Admins to curate Marketplace content for Studio. Mendix Admins can do the following from the **Marketplace Content** page in Control Center:
+    * Limit available public Marketplace content in Studio
+    * Approve and hide private Marketplace content in Studio
+
+## March 2022
+
+### March 24, 2022
+
+#### Improvements
+
+* We have made changes related to ad-hoc versioning and are now able to support more flexible version numbers as you create components. This means you can also publish components with version numbers that are backward-compatible.
+
+## February 2022
+
+### February 24, 2022
+
+#### New Features
+
+* There are now user trials available for **Premium** app services, such as Email Service and Speech to Text. This self-service experience helps you to evaluate the capabilities offered with these components and realize the value of premium content.
+* User trial subscriptions are now listed under My Subscriptions, and company trial and paid subscriptions are now listed under Company Subscriptions.
+* For new uploads of public components, you can now optionally share a virus scan report to speed up the governance process.
+* For solutions and solution templates, you can now add a use case relevant to the component. The use case is displayed in the component listing and includes header text and an external link.
+
+#### Improvements
+
+* We made performance improvements for when a large source file is uploaded, specifically on the navigation steps.
+* We improved the UI for self-service uploading your component to the Marketplace.
+
+### February 10, 2022
+
+#### Improvements
+
+* When you onboard a component now, the maximum number of screenshots is restricted to ten.
+* You can use form validations now when you navigate between steps during onboarding.
+
+#### Fixes
+
+* We fixed an issue with the logo cropper. Now the ratio of a cropped image is 600 x 420 pixels.
diff --git a/content/en/docs/releasenotes/marketplace/general-marketplace/2023.md b/content/en/docs/releasenotes/marketplace/general-marketplace/2023.md
new file mode 100644
index 00000000000..e3e259ef233
--- /dev/null
+++ b/content/en/docs/releasenotes/marketplace/general-marketplace/2023.md
@@ -0,0 +1,85 @@
+---
+title: "2023 Marketplace Release Notes"
+linktitle: "2023"
+url: /releasenotes/marketplace/2023/
+description: "2023 release notes for Marketplace"
+weight: 3
+numberless_headings: true
+---
+
+## November 2023
+
+### November 30, 2023
+
+#### New Features
+
+* We released the [Content API](/apidocs-mxsdk/apidocs/content-api/) for general use. This API allows you to retrieve information about both public and private company-specific Marketplace content.
+
+## September 2023
+
+### September 7, 2023
+
+#### Improvements
+
+In the past, downloading a component directly from the web Marketplace could lead to compatibility errors. Now, downloading a component can only happen directly from the Marketplace in Studio Pro. For that reason, we replaced the **Download** button on the [component details page](/appstore/component-details/) for widgets and modules with the **Use in Studio Pro** button. This new button allows you to copy the content ID so that you can [search for and use the component in Studio Pro](/appstore/use-content/#current-sp). This lowers the risk of introducing compatibility errors and improves the experience of installing the Marketplace content you need.
+
+## August 2023
+
+### August 5, 2023
+
+#### Improvements
+
+* Categories are now **Content Types**. We have reduced the number of content types and made them consistent across the platform. To learn more about the different content types available, visit the [Marketplace Guide](/appstore/overview/).
+* Sub-categories have been replaced with **Categories**. When submitting a new component, you can apply between one and three categories. When searching in the Marketplace, you can use categories to filter the content and find the right component for your use case.
+
+## June 2023
+
+### June 29, 2023
+
+#### New Features
+
+* You can now configure your own [proprietary license](/appstore/submit-content/#proprietary-license) when creating a new public component. The license will be reviewed by Mendix alongside the review of the component. After the license has been approved, you and anyone within your organization can use the license for other components. 
+
+## May 2023
+
+### May 25, 2023
+
+#### New Features
+
+* You can now reassign a draft to yourself if you have edit rights for the Marketplace component. The draft will be unassigned from the previous owner. This allows you to continue working on a Marketplace listing, even when your colleague is out of office.
+
+#### Improvements
+
+* *.mpk* files are now uploaded asynchronously in the flow for adding Marketplace content, which means that you can continue to go through the onboarding wizard while the upload is in progress.
+* We aligned the Marketplace UI with the rest of the Mendix Platform.
+
+#### Fixes
+
+* We fixed an issue with the notifications that are sent when a component update becomes available.
+* If a user's email address contained an upper-case letter, they did not have access to private components in [content groups](/appstore/home-page/#content-groups). This issue has been fixed.
+
+## April 2023
+
+### April 20, 2023
+
+#### New Features
+
+* You can now filter Marketplace content for **Public** or **Private** components via the **Visibility** filter.
+
+#### Improvements
+
+* The **Compatibility** filter now only allows for major Mendix versions.
+* The **Support** section of the [component details page](/appstore/component-details/) now includes a link to [Marketplace Content Support](/appstore/marketplace-content-support/).
+
+## March 2023
+
+### March 23, 2023
+
+#### New Features
+
+On top of open-source community-supported content, we are introducing an additional layer of support through our [Mendix Component Partner program](/appstore/partner-program/). Partner members can now bring their components to the Mendix Marketplace under terms that guarantee full support to customers:
+
+* Partners are free to select an existing open-source license, or they can select a commercial option with the corresponding license and present that.
+* Partners commit to providing support to customers under an SLA (meaning, under terms specified by the partner). Customers can rely on this SLA for support if something goes wrong. A partner-supported [component details page](/appstore/component-details/) contains a reference to the partner's support portal or the partner's support contact email.
+
+You can find and use partner-supported components on the [Marketplace home page](https://marketplace.mendix.com/) under **From our partners** and by selecting the [Partner](/appstore/marketplace-content-support/#category) **Support** level in the search box. A partner-supported component details page has an explicit indicator (a crown), which makes it easy to distinguish from community-supported content.
diff --git a/content/en/docs/releasenotes/marketplace/general-marketplace/2024.md b/content/en/docs/releasenotes/marketplace/general-marketplace/2024.md
new file mode 100644
index 00000000000..cac696d8e9d
--- /dev/null
+++ b/content/en/docs/releasenotes/marketplace/general-marketplace/2024.md
@@ -0,0 +1,76 @@
+---
+title: "2024 Marketplace Release Notes"
+linktitle: "2024"
+url: /releasenotes/marketplace/2024/
+description: "2024 release notes for Marketplace"
+weight: 2
+numberless_headings: true
+---
+
+## December 2024
+
+### December 12, 2024
+
+#### Improvements
+
+* Release notes are now editable for all versions of your Marketplace components. You no longer have to reach out to Mendix Support to change them.
+* The Company Subscriptions page has been removed from the Marketplace.
+* The Support Type labels 'Siemens' and 'Partner' have been added to the Marketplace in Studio Pro.
+
+## October 2024
+
+### October 31, 2024
+
+#### New Features
+
+* Components with the content type Solutions or Industry Templates now have a new component details page.
+* On the component details page, you can now view information about the company that owns the component and the industry it belongs to.
+* The **Releases** tab on the component details page now includes two search bars, enabling you to search by release notes and Mendix versions.
+
+#### Improvements
+
+* Videos previously located on the **Documentation** tab have been moved to the **Overview** tab on the component details page.
+* If you click **Start with App** on a component details page of a starter app, you will start the Create App flow.
+
+#### Deprecations
+
+* The content types Banners and Solution Capabilities have been deprecated. You can no longer upload these two content types.
+
+## September 2024
+
+### September 26, 2024
+
+#### New Features
+
+* We added several new features to the Marketplace home page:
+    * You can now search for marketplace content by component name or company name, and apply relevant filters.
+    * Filters can now be easily cleared.
+    * Pagination has been introduced for search results, making navigation more streamlined.
+
+## June 2024
+
+### June 27, 2024
+
+#### New Features
+
+* We released of a new label specifically for React Ready widgets in the Marketplace. This enhancement is designed to help developers and users easily identify and access a wide range of widgets that are optimized for React Client applications. You can find a **React-Client** label next to a version of the product when navigating to the **Release** tab of a product [details page](/appstore/component-details/).
+
+#### Improvements
+
+* We made significant improvements to the [Studio Pro download](https://marketplace.mendix.com/link/studiopro) page. The updated interface now provides a more intuitive and user-friendly experience, making it easier to find and download the latest or previous versions of Studio Pro. Each version of Studio Pro now has its own dedicated page, containing important links such as release notes, release blogs, and all relevant installers.
+* We improved the navigation menus of the [Marketplace home page](/appstore/overview/) to enhance user experience.
+
+## March 2024
+
+### March 7, 2024
+
+#### New Features
+
+This release focuses on improving the Marketplace Reviews feature and making it even better for our users.
+
+* We have improved the **Review** tab to give you tips when writing your review. This feature is available both on the Marketplace site and within Studio Pro.
+* We have decoupled ratings and reviews. You can now rate a component 4 or 5 stars without leaving a review. For 3, 2, and 1 star ratings, a review is mandatory.
+* You can now see additional information, such as reviews, on the Marketplace site without needing to sign in.
+* We have removed the "Company Reviews" page from **Marketplace Home Page**.
+* You can now to filter reviews based on specific criteria.
+* We have improved the **Review** tab to give you tips when replying to a review of your Marketplace component.
diff --git a/content/en/docs/releasenotes/marketplace/general-marketplace/2025.md b/content/en/docs/releasenotes/marketplace/general-marketplace/2025.md
new file mode 100755
index 00000000000..ebeeb07d58e
--- /dev/null
+++ b/content/en/docs/releasenotes/marketplace/general-marketplace/2025.md
@@ -0,0 +1,133 @@
+---
+title: "2025 Marketplace Release Notes"
+linktitle: "2025"
+url: /releasenotes/marketplace/2025/
+description: "2025 release notes for Marketplace"
+weight: 1
+numberless_headings: true
+---
+
+## December 2025
+
+### December 11, 2025
+
+#### New Features
+
+* You can now deprecate Marketplace components that are no longer maintained. This helps keep a clean and reliable Marketplace ecosystem, with full visibility into the content that is no longer supported, as well as its recommended alternatives.    
+  For details, refer to [Deprecating Marketplace Content](/appstore/deprecate-content/).
+
+
+## October 2025
+
+### October 9, 2025
+
+#### Improvements
+
+We have made several improvements aimed at streamlining the experience of uploading content to the Marketplace and improving quality control:
+
+* The upload flow is now completely revamped, featuring a new interface and additional features, such as:
+
+    * Adding multiple resource links, such as websites, to provide additional information.
+    * Assigning multiple developers from your company as component owners.
+    * Adding support information.
+    * Control over the image size, allowing you to crop screenshots for a better visual experience.
+    * Support for rich text in the release notes field.
+    * A new **Component Tagline** field, allowing you to add a short description that will be displayed on your component's card in the Marketplace.
+    * A new preview page, allowing you to see exactly what the component will look like once published.
+
+* New component versions are now also scanned, and automatically uploaded if no vulnerabilities are found.
+* The email announcing a new version of a component now also includes release notes.
+
+## September 2025
+
+### September 8, 2025
+
+#### Improvements
+
+In an effort to keep the Mendix Marketplace clean, trustworthy, and compliant with open-source standards, we have retired the following components:
+
+* Antd Segmented
+* App Guide  
+* Attribute Helper  
+* Azure Face API  
+* Bootstrap Wysiwyg Editor  
+* Collaboration Portal  
+* Collapsible Header for Mendix Native  
+* Confetti  
+* D3 Matrix  
+* D3 Network  
+* Digital Investment Advice as a Service  
+* Dropbox Connector  
+* Element Animator  
+* eTeller  
+* Expand Text Native (Read More)  
+* Focus Helper  
+* Horizontal Native Chart  
+* Imburse  
+* Inclination Test Preparation  
+* Institutional Onboarding  
+* JavaScript Actions How-To Advanced  
+* JSON To Tree  
+* Konami Code Widget  
+* Lottie Animations  
+* Lottie Animations (Native)  
+* Marine Issue Management  
+* MFI Stencil Management  
+* Multi tenant administration  
+* MxHackathon  
+* Native Calendar  
+* Native Content Renderer  
+* Native Segmented Progress Bar  
+* OAuth  
+* Parallax Header  
+* Ping One Authentication  
+* Planner Widget  
+* PLM, ERP and LAB Connect  
+* Portfolio Manager  
+* Radio Button Native  
+* Senseye Connector  
+* Set Attribute  
+* ShiftSwap  
+* Shrinking header  
+* Skip Link | Skip Navigation | A11Y Widget  
+* Smart Warehousing  
+* Smooth List  
+* Sparklines  
+* StyleSheetSwitcher  
+* SVGRenderer  
+* Tag Selector  
+* Text Template  
+* University - Event App  
+* Vertical Timeline  
+* Workforce Management  
+
+## June 2025
+
+### June 25, 2025
+
+#### New Features
+
+* We have released [Mendix Data Loader](/appstore/modules/snowflake/mendix-data-loader/) version 2.3.0. This version allows you to configure a specific warehouse for your task, which is used as a compute resource when the task triggers data ingestion. This is controlled through two new options: **Use Specific Warehouse** and **Warehouse**.
+
+### June 19, 2025
+
+#### Improvements
+
+* We have redesigned the Studio Pro download page to make it easier for you to identify supported versions and make informed version management decisions at a glance.    
+The new layout prominently displays the latest LTS and MTS releases, allowing you to choose the best version for your production apps. It also includes a definition of each release type to clarify the meaning of the labels in the version table. 
+
+## May 2025
+
+### May 22, 2025
+
+#### Improvements
+
+* We have replaced the [Marketplace Curation](/control-center/marketplace-curation/) <text class="badge badge-pill badge-recommended" style="margin-left:0px">RECOMMENDED</text> label with <text class="badge badge-pill badge-company-approved" style="margin-left:0px"> {{% icon name="checkmark-shield-filled" color="green" %}}COMPANY APPROVED</text>. The new label indicates Marketplace components that meet company policies and guidelines.
+
+## January 2025
+
+### January 16, 2025
+
+#### Improvements
+
+* We have removed outdated components from the Marketplace. These components were no longer supported, actively maintained, or guaranteed to work as intended. This step ensures a more reliable experience for all users.
diff --git a/content/en/docs/releasenotes/marketplace/general-marketplace/_index.md b/content/en/docs/releasenotes/marketplace/general-marketplace/_index.md
new file mode 100644
index 00000000000..c5ca61facc2
--- /dev/null
+++ b/content/en/docs/releasenotes/marketplace/general-marketplace/_index.md
@@ -0,0 +1,25 @@
+---
+title: "Marketplace Release Notes"
+linktitle: "General Marketplace"
+url: /releasenotes/marketplace/
+description: "Release notes for updates to the Mendix Marketplace"
+weight: 35
+numberless_headings: true
+aliases:
+    - /releasenotes/app-store/index.html
+#This document is mapped to the landing page, update the link there if renaming or moving the doc file
+---
+
+These release notes cover changes made to the [Mendix Marketplace](/appstore/).
+
+Click the link corresponding to the year for which you want to see release notes:
+
+* [2025](/releasenotes/marketplace/2025/)
+* [2024](/releasenotes/marketplace/2024/)
+* [2023](/releasenotes/marketplace/2023/)
+* [2022](/releasenotes/marketplace/2022/)
+* [2021](/releasenotes/marketplace/2021/)
+* [2020](/releasenotes/marketplace/2020/)
+* [2019](/releasenotes/marketplace/2019/)
+* [2018](/releasenotes/marketplace/2018/)
+* [2017](/releasenotes/marketplace/2017/)
diff --git a/content/en/docs/releasenotes/marketplace/marketplace-services/_index.md b/content/en/docs/releasenotes/marketplace/marketplace-services/_index.md
index 1495dda6211..635404c87fe 100644
--- a/content/en/docs/releasenotes/marketplace/marketplace-services/_index.md
+++ b/content/en/docs/releasenotes/marketplace/marketplace-services/_index.md
@@ -3,7 +3,7 @@ title: "Marketplace Services Release Notes"
 linktitle: "Marketplace Services"
 url: /releasenotes/marketplace-services/
 description: "Release notes for updates to Mendix Marketplace services"
-weight: 45
+weight: 50
 numberless_headings: true
 ---
 
diff --git a/content/en/docs/releasenotes/studio-pro/8/8.0.md b/content/en/docs/releasenotes/studio-pro/8/8.0.md
index 9525f4bd936..92910099b88 100644
--- a/content/en/docs/releasenotes/studio-pro/8/8.0.md
+++ b/content/en/docs/releasenotes/studio-pro/8/8.0.md
@@ -360,7 +360,7 @@ We upgraded the following runtime dependencies:
     * Fixed in [8.7.0](/releasenotes/studio-pro/8.7/#1530).
 * Users with non-administrative [user roles](/refguide/user-roles/) with the permission to manage users are able to escalate their privileges. For more information on this vulnerability, see [SSA-875726 Privilege Escalation Vulnerability in Mendix](https://new.siemens.com/global/en/products/services/cert.html#SecurityPublications).
     * Fixed in [8.6.9](/releasenotes/studio-pro/8.6/#875726).
-* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
+* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/2020/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
     * Fixed in [8.6.4](/releasenotes/studio-pro/8.6/#private-content).
 * In native mobile apps, the back button text changes to **Back** in the case of longer page titles. This is currently not translatable.
     * Fixed in [8.2.0](/releasenotes/studio-pro/8.2/#170).
diff --git a/content/en/docs/releasenotes/studio-pro/8/8.1.md b/content/en/docs/releasenotes/studio-pro/8/8.1.md
index a395e7027f5..023fee07a0b 100644
--- a/content/en/docs/releasenotes/studio-pro/8/8.1.md
+++ b/content/en/docs/releasenotes/studio-pro/8/8.1.md
@@ -23,7 +23,7 @@ weight: 99
     * Fixed in [8.7.0](/releasenotes/studio-pro/8.7/#1530).
 * Users with non-administrative [user roles](/refguide/user-roles/) with the permission to manage users are able to escalate their privileges. For more information on this vulnerability, see [SSA-875726 Privilege Escalation Vulnerability in Mendix](https://new.siemens.com/global/en/products/services/cert.html#SecurityPublications).
     * Fixed in [8.6.9](/releasenotes/studio-pro/8.6/#875726).
-* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
+* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/2020/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
     * Fixed in [8.6.4](/releasenotes/studio-pro/8.6/#private-content).
 * When you use the **Extract sub-microflow** or **Extract sub-nanoflow** functionality, the contents of the extracted flow might be lost after exiting Studio Pro. As a workaround, open the extracted flow, make a small change (for example, change the position of an activity), then save manually. (Ticket 88764)
     * Fixed in [8.3.0](/releasenotes/studio-pro/8.3/#89101).
@@ -119,7 +119,7 @@ We added the [mx command-line tool](/refguide8/mx-command-line-tool/). This is a
     * Fixed in [8.7.0](/releasenotes/studio-pro/8.7/#1530).
 * Users with non-administrative [user roles](/refguide/user-roles/) with the permission to manage users are able to escalate their privileges. For more information on this vulnerability, see [SSA-875726 Privilege Escalation Vulnerability in Mendix](https://new.siemens.com/global/en/products/services/cert.html#SecurityPublications).
     * Fixed in [8.6.9](/releasenotes/studio-pro/8.6/#875726).
-* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
+* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/2020/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
     * Fixed in [8.6.4](/releasenotes/studio-pro/8.6/#private-content).
 * When you use the **Extract sub-microflow** or **Extract sub-nanoflow** functionality, the contents of the extracted flow might be lost after exiting Studio Pro. As a workaround, open the extracted flow, make a small change (for example, change the position of an activity), then save manually. (Ticket 88764)
     * Fixed in [8.3.0](/releasenotes/studio-pro/8.3/#89101).
diff --git a/content/en/docs/releasenotes/studio-pro/8/8.2.md b/content/en/docs/releasenotes/studio-pro/8/8.2.md
index 8586ff53cc5..a13c638fb83 100644
--- a/content/en/docs/releasenotes/studio-pro/8/8.2.md
+++ b/content/en/docs/releasenotes/studio-pro/8/8.2.md
@@ -23,7 +23,7 @@ weight: 98
     * Fixed in [8.7.0](/releasenotes/studio-pro/8.7/#1530).
 * Users with non-administrative [user roles](/refguide/user-roles/) with the permission to manage users are able to escalate their privileges. For more information on this vulnerability, see [SSA-875726 Privilege Escalation Vulnerability in Mendix](https://new.siemens.com/global/en/products/services/cert.html#SecurityPublications).
     * Fixed in [8.6.9](/releasenotes/studio-pro/8.6/#875726).
-* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
+* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/2020/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
     * Fixed in [8.6.4](/releasenotes/studio-pro/8.6/#private-content).
 * When you use the **Extract sub-microflow** or **Extract sub-nanoflow** functionality, the contents of the extracted flow might be lost after exiting Studio Pro. As a workaround, open the extracted flow, make a small change (for example, change the position of an activity), then save manually. (Ticket 88764)
     * Fixed in [8.3.0](/releasenotes/studio-pro/8.3/#89101).
@@ -52,7 +52,7 @@ We have decided to retract version 8.2.1 due to an issue related to committing n
     * Fixed in [8.7.0](/releasenotes/studio-pro/8.7/#1530).
 * Users with non-administrative [user roles](/refguide/user-roles/) with the permission to manage users are able to escalate their privileges. For more information on this vulnerability, see [SSA-875726 Privilege Escalation Vulnerability in Mendix](https://new.siemens.com/global/en/products/services/cert.html#SecurityPublications).
     * Fixed in [8.6.9](/releasenotes/studio-pro/8.6/#875726).
-* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
+* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/2020/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
     * Fixed in [8.6.4](/releasenotes/studio-pro/8.6/#private-content).
 * When you use the **Extract sub-microflow** or **Extract sub-nanoflow** functionality, the contents of the extracted flow might be lost after exiting Studio Pro. As a workaround, open the extracted flow, make a small change (for example, change the position of an activity), then save manually. (Ticket 88764)
     * Fixed in [8.3.0](/releasenotes/studio-pro/8.3/#89101).
@@ -174,7 +174,7 @@ Kudos to [Sven Franke](https://community.mendix.com/link/ideas/1473) and [James
     * Fixed in [8.7.0](/releasenotes/studio-pro/8.7/#1530).
 * Users with non-administrative [user roles](/refguide/user-roles/) with the permission to manage users are able to escalate their privileges. For more information on this vulnerability, see [SSA-875726 Privilege Escalation Vulnerability in Mendix](https://new.siemens.com/global/en/products/services/cert.html#SecurityPublications).
     * Fixed in [8.6.9](/releasenotes/studio-pro/8.6/#875726).
-* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
+* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/2020/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
     * Fixed in [8.6.4](/releasenotes/studio-pro/8.6/#private-content).
 * When you use the **Extract sub-microflow** or **Extract sub-nanoflow** functionality, the contents of the extracted flow might be lost after exiting Studio Pro. As a workaround, open the extracted flow, make a small change (for example, change the position of an activity), then save manually. (Ticket 88764)
     * Fixed in [8.3.0](/releasenotes/studio-pro/8.3/#89101).
diff --git a/content/en/docs/releasenotes/studio-pro/8/8.3.md b/content/en/docs/releasenotes/studio-pro/8/8.3.md
index 3a1bf2f51c5..ca4632e947f 100644
--- a/content/en/docs/releasenotes/studio-pro/8/8.3.md
+++ b/content/en/docs/releasenotes/studio-pro/8/8.3.md
@@ -24,7 +24,7 @@ weight: 97
     * Fixed in [8.7.0](/releasenotes/studio-pro/8.7/#1530).
 * Users with non-administrative [user roles](/refguide/user-roles/) with the permission to manage users are able to escalate their privileges. For more information on this vulnerability, see [SSA-875726 Privilege Escalation Vulnerability in Mendix](https://new.siemens.com/global/en/products/services/cert.html#SecurityPublications).
     * Fixed in [8.6.9](/releasenotes/studio-pro/8.6/#875726).
-* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
+* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/2020/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
     * Fixed in [8.6.4](/releasenotes/studio-pro/8.6/#private-content).
 
 ## 8.3.1 {#831}
@@ -45,7 +45,7 @@ weight: 97
     * Fixed in [8.7.0](/releasenotes/studio-pro/8.7/#1530).
 * Users with non-administrative [user roles](/refguide/user-roles/) with the permission to manage users are able to escalate their privileges. For more information on this vulnerability, see [SSA-875726 Privilege Escalation Vulnerability in Mendix](https://new.siemens.com/global/en/products/services/cert.html#SecurityPublications).
     * Fixed in [8.6.9](/releasenotes/studio-pro/8.6/#875726).
-* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
+* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/2020/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
     * Fixed in [8.6.4](/releasenotes/studio-pro/8.6/#private-content).
 * If more than three objects are autocommitted in a transaction, they are not properly handled as autocommitted objects. This is a serious issue and, for that reason, we advise you to upgrade to version 8.3.2 as soon as possible. (Ticket 92549)
     * Fixed in [8.3.2](#92549).
@@ -169,7 +169,7 @@ Have you ever dreamed of creating your own [group box](/refguide8/group-box/) or
     * Fixed in [8.7.0](/releasenotes/studio-pro/8.7/#1530).
 * Users with non-administrative [user roles](/refguide/user-roles/) with the permission to manage users are able to escalate their privileges. For more information on this vulnerability, see [SSA-875726 Privilege Escalation Vulnerability in Mendix](https://new.siemens.com/global/en/products/services/cert.html#SecurityPublications).
     * Fixed in [8.6.9](/releasenotes/studio-pro/8.6/#875726).
-* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
+* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/2020/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
     * Fixed in [8.6.4](/releasenotes/studio-pro/8.6/#private-content).
 * Dragging and dropping a microflow from [Project Explorer](/refguide8/project-explorer/) into a microflow to create a [microflow call](/refguide8/microflow-call/) activity is not possible.
     * Fixed in [8.3.2](#lc310).
diff --git a/content/en/docs/releasenotes/studio-pro/8/8.4.md b/content/en/docs/releasenotes/studio-pro/8/8.4.md
index 6e0aa42302d..e286bc2baf5 100644
--- a/content/en/docs/releasenotes/studio-pro/8/8.4.md
+++ b/content/en/docs/releasenotes/studio-pro/8/8.4.md
@@ -23,7 +23,7 @@ weight: 96
     * Fixed in [8.7.0](/releasenotes/studio-pro/8.7/#1530).
 * Users with non-administrative [user roles](/refguide/user-roles/) with the permission to manage users are able to escalate their privileges. For more information on this vulnerability, see [SSA-875726 Privilege Escalation Vulnerability in Mendix](https://new.siemens.com/global/en/products/services/cert.html#SecurityPublications).
     * Fixed in [8.6.9](/releasenotes/studio-pro/8.6/#875726).
-* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
+* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/2020/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
     * Fixed in [8.6.4](/releasenotes/studio-pro/8.6/#private-content).
 
 ## 8.4.3 {#843}
@@ -44,7 +44,7 @@ weight: 96
     * Fixed in [8.7.0](/releasenotes/studio-pro/8.7/#1530).
 * Users with non-administrative [user roles](/refguide/user-roles/) with the permission to manage users are able to escalate their privileges. For more information on this vulnerability, see [SSA-875726 Privilege Escalation Vulnerability in Mendix](https://new.siemens.com/global/en/products/services/cert.html#SecurityPublications).
     * Fixed in [8.6.9](/releasenotes/studio-pro/8.6/#875726).
-* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
+* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/2020/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
     * Fixed in [8.6.4](/releasenotes/studio-pro/8.6/#private-content).
 
 ## 8.4.2 {#842}
@@ -66,7 +66,7 @@ weight: 96
     * Fixed in [8.7.0](/releasenotes/studio-pro/8.7/#1530).
 * Users with non-administrative [user roles](/refguide/user-roles/) with the permission to manage users are able to escalate their privileges. For more information on this vulnerability, see [SSA-875726 Privilege Escalation Vulnerability in Mendix](https://new.siemens.com/global/en/products/services/cert.html#SecurityPublications).
     * Fixed in [8.6.9](/releasenotes/studio-pro/8.6/#875726).
-* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
+* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/2020/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
     * Fixed in [8.6.4](/releasenotes/studio-pro/8.6/#private-content).
 
 ## 8.4.1 {#841}
@@ -87,7 +87,7 @@ weight: 96
     * Fixed in [8.7.0](/releasenotes/studio-pro/8.7/#1530).
 * Users with non-administrative [user roles](/refguide/user-roles/) with the permission to manage users are able to escalate their privileges. For more information on this vulnerability, see [SSA-875726 Privilege Escalation Vulnerability in Mendix](https://new.siemens.com/global/en/products/services/cert.html#SecurityPublications).
     * Fixed in [8.6.9](/releasenotes/studio-pro/8.6/#875726).
-* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
+* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/2020/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
     * Fixed in [8.6.4](/releasenotes/studio-pro/8.6/#private-content).
 * If more than three objects are autocommitted in a transaction, they are not properly handled as autocommitted objects. This is a serious issue and, for that reason, we advise you to upgrade to version 8.4.2 as soon as possible. (Ticket 92549)
     * Fixed in [8.4.2](#92549).
@@ -194,7 +194,7 @@ For more information on this release, see the [Mendix 8.4 – We Deliver Good Ne
     * Fixed in [8.7.0](/releasenotes/studio-pro/8.7/#1530).
 * Users with non-administrative [user roles](/refguide/user-roles/) with the permission to manage users are able to escalate their privileges. For more information on this vulnerability, see [SSA-875726 Privilege Escalation Vulnerability in Mendix](https://new.siemens.com/global/en/products/services/cert.html#SecurityPublications).
     * Fixed in [8.6.9](/releasenotes/studio-pro/8.6/#875726).
-* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
+* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/2020/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
     * Fixed in [8.6.4](/releasenotes/studio-pro/8.6/#private-content).
 * If more than three objects are autocommitted in a transaction, they are not properly handled as autocommitted objects. This is a serious issue and, for that reason, we advise you to upgrade to version 8.4.2 as soon as possible. (Ticket 92549)
     * Fixed in [8.4.2](#92549).
diff --git a/content/en/docs/releasenotes/studio-pro/8/8.5.md b/content/en/docs/releasenotes/studio-pro/8/8.5.md
index 2027602300e..d04425c395c 100644
--- a/content/en/docs/releasenotes/studio-pro/8/8.5.md
+++ b/content/en/docs/releasenotes/studio-pro/8/8.5.md
@@ -23,7 +23,7 @@ weight: 95
     * Fixed in [8.7.0](/releasenotes/studio-pro/8.7/#1530).
 * Users with non-administrative [user roles](/refguide/user-roles/) with the permission to manage users are able to escalate their privileges. For more information on this vulnerability, see [SSA-875726 Privilege Escalation Vulnerability in Mendix](https://new.siemens.com/global/en/products/services/cert.html#SecurityPublications).
     * Fixed in [8.6.9](/releasenotes/studio-pro/8.6/#875726).
-* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
+* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/2020/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
     * Fixed in [8.6.4](/releasenotes/studio-pro/8.6/#private-content).
 * Changes in a [change object](/refguide8/change-object/) activity are being run all at once instead of being run sequentially. In an example scenario, there is an input object "Entity" with an "Attribute1" with the value of `old value`. If the value of "Attribute1" is changed to `new value` and the value of "Attribute2" is changed to `$Entity/Attribute1` in the change object activity, the result is that "Attribute1" is updated to `new value`, but the value of "Attribute2" is updated to `old value` (when it should also be updated to `new value`). (Ticket 93385)
     * Fixed in [8.6.0](/releasenotes/studio-pro/8.6/#93385).
@@ -84,7 +84,7 @@ For more information on this release, see the [Mendix 8.5 – Life Is Good](http
     * Fixed in [8.7.0](/releasenotes/studio-pro/8.7/#1530).
 * Users with non-administrative [user roles](/refguide/user-roles/) with the permission to manage users are able to escalate their privileges. For more information on this vulnerability, see [SSA-875726 Privilege Escalation Vulnerability in Mendix](https://new.siemens.com/global/en/products/services/cert.html#SecurityPublications).
     * Fixed in [8.6.9](/releasenotes/studio-pro/8.6/#875726).
-* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
+* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/2020/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
     * Fixed in [8.6.4](/releasenotes/studio-pro/8.6/#private-content).
 * Changes in a [change object](/refguide8/change-object/) activity are being run all at once instead of being run sequentially. In an example scenario, there is an input object "Entity" with an "Attribute1" with the value of `old value`. If the value of "Attribute1" is changed to `new value` and the value of "Attribute2" is changed to `$Entity/Attribute1` in the change object activity, the result is that "Attribute1" is updated to `new value`, but the value of "Attribute2" is updated to `old value` (when it should also be updated to `new value`). (Ticket 93385)
     * Fixed in [8.6.0](/releasenotes/studio-pro/8.6/#93385).
diff --git a/content/en/docs/releasenotes/studio-pro/8/8.6.md b/content/en/docs/releasenotes/studio-pro/8/8.6.md
index b3169ac4e72..17e1de15eda 100644
--- a/content/en/docs/releasenotes/studio-pro/8/8.6.md
+++ b/content/en/docs/releasenotes/studio-pro/8/8.6.md
@@ -17,7 +17,7 @@ weight: 94
 
 ### Known Issues
 
-* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
+* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/2020/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
     * Fixed in [8.10.0](/releasenotes/studio-pro/8.10/#1400).
 
 ## 8.6.8 {#868}
@@ -32,7 +32,7 @@ weight: 94
 
 ### Known Issues
 
-* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
+* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/2020/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
     * Fixed in [8.10.0](/releasenotes/studio-pro/8.10/#1400).
 * Users with non-administrative [user roles](/refguide/user-roles/) with the permission to manage users are able to escalate their privileges. For more information on this vulnerability, see [SSA-875726 Privilege Escalation Vulnerability in Mendix](https://new.siemens.com/global/en/products/services/cert.html#SecurityPublications).
     * Fixed in [8.6.9](#875726).
@@ -55,7 +55,7 @@ weight: 94
 
 ### Known Issues
 
-* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
+* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/2020/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
     * Fixed in [8.10.0](/releasenotes/studio-pro/8.10/#1400).
 * Users with non-administrative [user roles](/refguide/user-roles/) with the permission to manage users are able to escalate their privileges. For more information on this vulnerability, see [SSA-875726 Privilege Escalation Vulnerability in Mendix](https://new.siemens.com/global/en/products/services/cert.html#SecurityPublications).
     * Fixed in [8.6.9](#875726).
@@ -72,7 +72,7 @@ weight: 94
 
 ### Known Issues
 
-* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
+* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/2020/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
     * Fixed in [8.10.0](/releasenotes/studio-pro/8.10/#1400).
 * Users with non-administrative [user roles](/refguide/user-roles/) with the permission to manage users are able to escalate their privileges. For more information on this vulnerability, see [SSA-875726 Privilege Escalation Vulnerability in Mendix](https://new.siemens.com/global/en/products/services/cert.html#SecurityPublications).
     * Fixed in [8.6.9](#875726).
@@ -93,7 +93,7 @@ weight: 94
 
 ### Known Issues
 
-* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
+* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/2020/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
     * Fixed in [8.10.0](/releasenotes/studio-pro/8.10/#1400).
 * Users with non-administrative [user roles](/refguide/user-roles/) with the permission to manage users are able to escalate their privileges. For more information on this vulnerability, see [SSA-875726 Privilege Escalation Vulnerability in Mendix](https://new.siemens.com/global/en/products/services/cert.html#SecurityPublications).
     * Fixed in [8.6.9](#875726).
@@ -131,7 +131,7 @@ weight: 94
     * Fixed in [8.10.0](/releasenotes/studio-pro/8.10/#211).
 * Users with non-administrative [user roles](/refguide/user-roles/) with the permission to manage users are able to escalate their privileges. For more information on this vulnerability, see [SSA-875726 Privilege Escalation Vulnerability in Mendix](https://new.siemens.com/global/en/products/services/cert.html#SecurityPublications).
     * Fixed in [8.6.9](#875726).
-* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
+* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/2020/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
     * Fixed in [8.6.4](#private-content).
 
 ## 8.6.2 {#862}
@@ -152,7 +152,7 @@ weight: 94
     * Fixed in [8.10.0](/releasenotes/studio-pro/8.10/#211).
 * Users with non-administrative [user roles](/refguide/user-roles/) with the permission to manage users are able to escalate their privileges. For more information on this vulnerability, see [SSA-875726 Privilege Escalation Vulnerability in Mendix](https://new.siemens.com/global/en/products/services/cert.html#SecurityPublications).
     * Fixed in [8.6.9](#875726).
-* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
+* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/2020/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
     * Fixed in [8.6.4](#private-content).
 
 ## 8.6.1 {#861}
@@ -172,7 +172,7 @@ weight: 94
     * Fixed in [8.10.0](/releasenotes/studio-pro/8.10/#211).
 * Users with non-administrative [user roles](/refguide/user-roles/) with the permission to manage users are able to escalate their privileges. For more information on this vulnerability, see [SSA-875726 Privilege Escalation Vulnerability in Mendix](https://new.siemens.com/global/en/products/services/cert.html#SecurityPublications).
     * Fixed in [8.6.9](#875726).
-* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
+* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/2020/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
     * Fixed in [8.6.4](#private-content).
 * When you add a second [language](/howto8/collaboration-requirements-management/translate-your-app-content/) in your Mendix application and try to switch between languages using the [shortcut keys](/refguide8/menus/#language), an error might occur.
     * Fixed in [8.6.2](#1510).
@@ -283,7 +283,7 @@ Because many users have indicated that copying and pasting microflows between ap
     * Fixed in [8.6.9](/releasenotes/studio-pro/8.6/#875726).
 * MySQL 8.0 cannot be used with the default authentication plugin as of this moment. Mendix uses the open-source [MariaDB](https://mariadb.com/) driver to connect, which has not yet added support. We will include the updated driver as soon as it is [released](https://jira.mariadb.org/browse/CONJ-663). To resolve this issue, you may consider using the [previous default plugin](https://mysqlserverteam.com/upgrading-to-mysql-8-0-default-authentication-plugin-considerations/) until the driver has been updated.
     * Fixed in [8.6.5](/releasenotes/studio-pro/8.6/#1530).
-* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
+* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/2020/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
     * Fixed in [8.6.4](#private-content).
 * When you use a JSON structure that defines an array of objects and also use a microflow in the mapping, then no data is imported. (Ticket 95390)
     * Fixed in [8.6.1](#95390).
diff --git a/content/en/docs/releasenotes/studio-pro/8/8.7.md b/content/en/docs/releasenotes/studio-pro/8/8.7.md
index bb5e205cbc8..9ebda6d117f 100644
--- a/content/en/docs/releasenotes/studio-pro/8/8.7.md
+++ b/content/en/docs/releasenotes/studio-pro/8/8.7.md
@@ -83,7 +83,7 @@ This is based on upvoted ideas from several Mendix community members: thank you
 
 * Users with non-administrative [user roles](/refguide/user-roles/) with the permission to manage users are able to escalate their privileges. For more information on this vulnerability, see [SSA-875726 Privilege Escalation Vulnerability in Mendix](https://new.siemens.com/global/en/products/services/cert.html#SecurityPublications).
     * Fixed in [8.12.5](/releasenotes/studio-pro/8.12/#875726).
-* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
+* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/2020/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
     * Fixed in [8.10.0](/releasenotes/studio-pro/8.10/#1400).
 * The first deployment of an app with a native mobile profile takes approximately one minute longer than usual, as the first deployment needs to build up a cache. On consecutive deployments, this time is reduced.
     * Fixed in [8.10.0](/releasenotes/studio-pro/8.10/#211).
diff --git a/content/en/docs/releasenotes/studio-pro/8/8.8.md b/content/en/docs/releasenotes/studio-pro/8/8.8.md
index 7950cb8c994..b9f06a4f22c 100644
--- a/content/en/docs/releasenotes/studio-pro/8/8.8.md
+++ b/content/en/docs/releasenotes/studio-pro/8/8.8.md
@@ -35,7 +35,7 @@ weight: 92
 
 * Users with non-administrative [user roles](/refguide/user-roles/) with the permission to manage users are able to escalate their privileges. For more information on this vulnerability, see [SSA-875726 Privilege Escalation Vulnerability in Mendix](https://new.siemens.com/global/en/products/services/cert.html#SecurityPublications).
     * Fixed in [8.12.5](/releasenotes/studio-pro/8.12/#875726).
-* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
+* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/2020/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
     * Fixed in [8.10.0](/releasenotes/studio-pro/8.10/#1400).
 * The first deployment of an app with a native mobile profile takes approximately one minute longer than usual, as the first deployment needs to build up a cache. On consecutive deployments, this time is reduced.
     * Fixed in [8.10.0](/releasenotes/studio-pro/8.10/#211).
@@ -140,7 +140,7 @@ However, some widgets and JavaScript actions still import AsyncStorage from the
 
 * Users with non-administrative [user roles](/refguide/user-roles/) with the permission to manage users are able to escalate their privileges. For more information on this vulnerability, see [SSA-875726 Privilege Escalation Vulnerability in Mendix](https://new.siemens.com/global/en/products/services/cert.html#SecurityPublications).
     * Fixed in [8.12.5](/releasenotes/studio-pro/8.12/#875726).
-* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
+* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/2020/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
     * Fixed in [8.10.0](/releasenotes/studio-pro/8.10/#1400).
 * The first deployment of an app with a native mobile profile takes approximately one minute longer than usual, as the first deployment needs to build up a cache. On consecutive deployments, this time is reduced.
     * Fixed in [8.10.0](/releasenotes/studio-pro/8.10/#211).
diff --git a/content/en/docs/releasenotes/studio-pro/8/8.9.md b/content/en/docs/releasenotes/studio-pro/8/8.9.md
index 03d76fa29c3..92a8deed5ea 100644
--- a/content/en/docs/releasenotes/studio-pro/8/8.9.md
+++ b/content/en/docs/releasenotes/studio-pro/8/8.9.md
@@ -75,7 +75,7 @@ However, some widgets and JavaScript actions still import AsyncStorage from the
 
 * Users with non-administrative [user roles](/refguide/user-roles/) with the permission to manage users are able to escalate their privileges. For more information on this vulnerability, see [SSA-875726 Privilege Escalation Vulnerability in Mendix](https://new.siemens.com/global/en/products/services/cert.html#SecurityPublications).
     * Fixed in [8.12.5](/releasenotes/studio-pro/8.12/#875726).
-* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
+* Downloading private content in the Marketplace available in Studio Pro has been temporarily disabled due to a security risk. Please see this issue described in the [Marketplace release notes](/releasenotes/marketplace/2020/#private-fix) for more information, details about where to find your private content, and plans for future version-specific fixes.
     * Fixed in [8.10.0](/releasenotes/studio-pro/8.10/#1400).
 * The first deployment of an app with a native mobile profile takes approximately one minute longer than usual, as the first deployment needs to build up a cache. On consecutive deployments, this time is reduced.
     * Fixed in [8.10.0](/releasenotes/studio-pro/8.10/#211).