Fixed doc problem
Merge branch 'dev' into ms