Merge "Remove BAL feature flag" into udc-dev