master
No namespaced test packages
Merge branch '3007.x' into merge/3007.x/3008.x-26-06-23
Add Pedro's suggested changes