Merge pull request #1678 from sebalix/8.0-fix-web_diagram