Update refs for Rec!1937

Supersedes !396 (closed) as something went wrong in that reference update.

Marked as WIP because more changes happened that expected, but we'll see what the nightlies have to say about it.

Needed for/ merge with Rec!1937 (merged).