Merge staging/4.1.3 into main

[jsangmeister]

I think there is no other way than to cherry-pick all missing commits since the histories diverged