merge in Winehq changes to reduce noise