sampling packages
adding package products
adding package rates
fixing sampling
Merge branch '2-4-stable'