Fix /usr issue, ftbfs with GCC-14 and cherry-pick upstream change

Let's see what we get :)

Merge request reports

Loading