Don't save empty values for clonable fields. #367