* commit 'e242c731f2288a615d54f329cdeb16157d4c15ea': Ensure install-during-restore is like install-then-restore