Merge pull request #1608 from user7887/lede-17.01