Merge "Make Clock options resettable (1/3)" into udc-dev