Merge "Setting flag for auto confirm feature to always return true" into udc-dev