Minor updates to data_management
Minor updates
Merge remote-tracking branch 'upstream/master'