Fix recordings
Merge branch 'shared' into renames