Merge branch 'tr/describe-advice'