Merge branch 'edge' into feature/spindle-refactor