Merge branch 'feature/resultDialogTimeAxis'