Merge branch 'wip-misplaced' into wip-sage-testing