Merge pull request #13502 from colemanw/shortcode