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