Merge pull request #2801 from valentinewallace/2023-12-rb-groundwork-followups