Merge branch 'sb/describe-broken'