Merge branch 'dk/describe-all-output-fix' into maint