CDB-3306 saving org data