patch will follow up.
Created attachment 8141 [details] Fix for bug 9351
==> Karolin for 4.0
Adding dependency to bug #9348 since the patch for that bug is applied before the patch for this bug in master.
Pushed to autobuild-v4-0-test.
Pushed to v4-0-test. Closing out bug report. Thanks!