Merge pull request #955 from Bouni/feature/spindle-refactor