Merge from origin/master
Merge from origin/master
Continuing conversion. TBC
Mostly finishing conversion to new hidden style. Also merged origin/main
Merge in origin/master
Finishing up conversion from hidden attribute, and slight style change for collections
Revert some items to allow behave tests to pass
Merge in origin/master
Revert more changes to reduce some risk.
Last reverts.
Merge pull request #216 from ENCODE-DCC/1126-conditionals

1126 conditionals
Added the fix to support retrieving columns from inner objects
Merge pull request #218 from ENCODE-DCC/1387_bug_fix

Added the fix to support retrieving columns from inner objects
Hot fix for 1387
Merged master on to the branch
Merge pull request #220 from ENCODE-DCC/1387_hot_fix

1387 hot fix
Merge in origin/master; conflicts resolved