Merge branch 'diagrams-#78991094'

[#78991094]