Merge "Fix problems with veridex packaging"