Changed returned data structure
auto-merge staging into master