Merge branch 'feature/dialog_back' into 'develop' Feature/dialog back See merge request aorszulak/keyring!102
