Merge remote-tracking branch 'refs/remotes/origin/refactoring' into refactoring