Comment by epmatsw

restore and maybe switch are the two missing ones I think. Rebase for me, but that’s preference. Cherry-pick too.