@dmitchell I see. I agree that this is more of a patch to fix this specific issue and should probably be looked into by someone more experienced with the codebase. So we can consider this PR as it is on hold then?

My time is pretty limited right now, but I'll see what I can do.