specific patches to follow
Created attachment 5630 [details] Patch for 3.4 Patch for 3.4
Created attachment 5631 [details] Patch for 3.5
Comment on attachment 5630 [details] Patch for 3.4 looks good
Comment on attachment 5631 [details] Patch for 3.5 looks good
Karolin, please pull into the release branches
Pushed to both branches. Closing out bug report. Thanks!