Merge branch 'wp/refactoring/18'