Just wanted to give a quick update on this. We have agreed on moving forward with this patch. I'm working on it now to get it through our CI and run some basic tests. I'll keep you updated. Thanks again for the patch, Emil! -Alok