Merge pull request #327 from micmac1/backport-chan-lantiq