Add manual directory
Merge branch 'master' into experimental