Merge "Rewrote FieldPack::createFieldPack for alignment"