Merge back 11.13.0 to develop#7467

ashishjain0512 wants to merge 26 commits intodevelopmermaid-js/mermaid:developfrom

mastermermaid-js/mermaid:masterCopy head branch name to clipboard