Merge pull request #7284 from mpg/use-md-can

Use md-can macros