Merge "Make functions private to keep TAPL design consistent" into udc-dev