Merge "Fix issue with late binding to ICS." into udc-dev