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