Merge "Allow udfps when strong auth is required" into sc-qpr1-dev