Merge branch 'tb/shallow-cleanup'