Merge branch 'jc/describe' into maint