Merge branch 'Fix-static-dir-doc' into 'develop'