Merge remote-tracking branch 'upstream/commRefactoring' into commRefactoring