[Pharo-dev] Merging refactoring changes