Merge branch 'nd/switch-and-restore'