0.84/Shell refactoring: Difference between revisions