Fix nested snaps
Merge branch 'fix-nested-snaps'