Enable saving of snapshot and trend tracker
Merge branch 'MH-1038' into dev