Merge branch 'Develop' of D:\Workshop\Work\ROI_APP\rtc_app\rtc-app with conflicts.
MyChanges
MyChanges
Refactoring of Ivan`s code
Refactoring of Ivan`s code
Refactoring of Ivan`s code