Merge branch 'lh/short-decorate'