Avoid duplicate declaration by using ensure_packages
Merge branch 'daniellawrence-ensure_packages' into dev