Merge branch 'sg/complete-decorate-full-not-long'