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