Created attachment 8058 [details] Proposed patch to fix the problem
Karolin, can you pickup this patch for rc3 after positive review from Simo ?
Pushed to autobuild-v4-0-test. Closing out bug report. Thanks!