Merge "Modify job serializer"