Approved by: portmgr (blanket fix) Sponsored by: Beckhoff Automation GmbH & Co. KG (cherry picked from commit 88c12b53)