Merge "Restore removed block to create dependencies" into udc-dev