Merge pull request #9224 from BKPepe/markdown