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

https://d.puremagic.com/issues/show_bug.cgi?id=12160