Merge branch 'feature/refactor' into cms-rails