PLA-1842 naive saving of data