Merge latest master#315

sovrasov merged 2 commits intofeature/cpp_refactoringopen-edge-platform/model_api:feature/cpp_refactoringfrom

vs/feature_merge_masteropen-edge-platform/model_api:vs/feature_merge_masterCopy head branch name to clipboard