Merge pull request #5541 from micmac1/jiri-lede-17.01