Merge branch 'lt/decorate'