divvy data access updates
Merge remote-tracking branch 'origin'
update data access methods