Resolve conflicts merge develop to release

[YuriyHryshchenko]

Type of Pull Request *

• [ ] CHANGE (fix or feature that would cause existing functionality to not work as expected)
• [ ] FEATURE (non-breaking change which adds functionality)
• [ ] BUGFIX (non-breaking change which fixes an issue)
• [ ] ENHANCEMENT (non-breaking change which improves existing functionality)
• [x] NONE (if none of the other choices apply. For example, tooling, build system, CI, docs, etc.)

Description *

Resolved conflicts to merge develop to release.