Merge "support package scope prepare/teardown"