Merge branch 'spruce-dev-branch'