Merge pull request #496 from micmac1/backport-sigwire