Merge "CSD: Remove forced logic" into udc-dev