Merge pull request #3125 from ysc3839/cifsd