KFSUPGRADE-993 : changes for 'additional fields'.