Cherry Pick

Focus: gezielte Commit-Übernahme und Konfliktbewertung

This text file is intentionally not Markdown so the repository keeps the same Markdown file layout as the reference workshop.
