Merge pull request #3183 from 9rnsr/fix12047

[REG2.065a] Issue 12047 - UDAs are not checked