Merge branch 'per-package-env-hook' into HEAD