Enable saving of snapshot and trend tracker
Fix conflicts