fix Issue 12160 - UDA related regressions
Merge pull request #3266 from 9rnsr/fix12160

[REG2.065a] Issue 12160 - UDA related regressions