Merge "New trace sections for shade expansion" into udc-dev