Merge remote-tracking branch 'origin/feature/dependecy-injection' into feature/dependecy-injection
refactoring dialogs