merge from EyeSee360
Merge branch 'dev_oivanov_230714'