Here are a couple of example patches I made in the past covering this topic. They're probably similar to what @bonemap already posted, but maybe they'll be helpful too.
Dropbox Link: https://www.dropbox.com/scl/fo/zfr1hzfkk7atkv0tomn9s/h?rlkey=f316ap3zwf1xji2zr804d81f5&dl=0
