Merge branch 'rs/decorate'