remove bundle args
Merge branch 'master' into staging