We need to backport commit 15f191a2329d08b92111f71e22f8a28c8a39c193 from master/4.5
Created attachment 12369 [details] Patch for v4-2-test
Created attachment 12370 [details] Patch for v4-3-test
Created attachment 12371 [details] Patch for v4-4-test
Pushed to autobuild-v4-{2,3,4}-test
Pushed to v4-{2,3,4}-test.
Karolin, please remember to take this for a possible v4-2 security release