Merge shortcode branch...