changes for packaging 1.9