master
Migrate package tests to the main test suite
Merge branch '3007.x' into merge/3007.x/3008.x-26-04-30