daf1fd1e55
Cherry pick patch that fixes the issue since it wasn't included in the 3.2.2 release by upstream. PR: 269494 Reviewed by: mbeis@xs4all.nl