Merge branch 'ra/decorate-limit-refs'