Merge "Scaffolding for Shell Transitions"