Merge Branches 1.2.3WebUiPerformance with master