Here's the rebased patch. It should apply without issue. Best!
Tom