Merge pull request #2018 from iovisor/yhs_dev

sync with latest net-next