Move nested shortcodes to their own branch for now