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