Is there a way to continue the numbering in an ordered list with a code block between items using the highlight short code?

Wrapping the shortcode in a div works.

Ordered lists with highlight shorcode

Topic		Replies	Views
Put a blockquote into a numbered list support	8	5207	June 26, 2019
Ordered list with code blocks not resuming the order support	2	507	January 4, 2020
Adding code within numbered list support	2	507	October 8, 2019
Making highlight shortcode "indentation-aware" for code blocks within list support	2	1186	May 4, 2019
Code tags not working when applied to items in ordered/unordered list? Using Themes	5	862	October 18, 2021