The "Auto-Merge" feature used in translation workflows to copy non-translatable property values from master to derived contents has been improved to exclude translatable properties nested in struct properties. In previous releases, nested properties that were marked as translatable were both passed to translation, and copied ("auto-merged") from master to derived, which could have led to warnings about merge conflicts in the workflow. One example of such a nested property is the translatable "call to action button text" of the teaser options for a Blueprint's CMArticle content, which is now correctly ignored by the "auto-merge" logic.

Note, that you must re-upload the translation workflow definition using cm upload for this to become effective.

As part of this change, the Blueprint configuration for the translate.xliff.translatableExpressions bean has moved from apps/studio-server/modules/studio/studio-blueprint-component/src/main/resources/META-INF/coremedia/component-studio-blueprint.xml to the newly added Blueprint Maven module com.coremedia.blueprint:multi-site in shared/common/modules/shared/multi-site/src/main/resources/com/coremedia/blueprint/common/multisite/translation-config.xml . The new module makes the configuration available in the Workflow Server as well. If you have changed the configuration, then you must make sure to move it to the new file.

(CMS-10850)