KFSPTS-3599 add more changes for the new fields validation, etc