am 6bef5eb4: am 6422ee71: Merge "Rewrote FieldPack::createFieldPack for alignment"

* commit '6bef5eb4e26d413044076a1dbfe9bce38218bd86':
  Rewrote FieldPack::createFieldPack for alignment