DF-5048 saving prototype fields
merge
DF-5048 saving prototype fields