Merge "Tests for FieldPacker fix." into jb-dev