Data collection updates
Merge branch 'staging' of github.com:Placester/builder into staging