Add the rest of depends
Merge branch 'master' into nginx-refactor