Merge branch 'rs/simplify-by-deco-with-deco-refs-exclude'