Merge branch 'no-deps'