Merge "Remove unused/obsolete feature flags" into udc-dev