Merge "Fix Udfps setup being blocked due to bouncerExpansion value" into main