Expand attribute value type to support complex values everywhere and cleanup surrounding code
#14221
| Job | Run time |
|---|---|
| 13s | |
| 13s |