Merge branch 'jt/decorate-api'