Merge branch 'rcsole-move-refactor'