Merge "Update MetadataController" into pi-car-dev