Merge branch 'tb/complete-describe'