Merge "Update to new extra data API" into master-nova