Merge "package creation store preparation"