LA-2: JSON attribute metadata cleaned up (#2)
Merge remote-tracking branch 'origin/master'