now using lodash in berry
Merge branch 'master' into dev