added underscore as an dependency
Merge branch 'server-side-support'