[task] rebased with upstream/develop
Merge pull request #60 from davidmoebius/OSNG-342

[task] rebased with upstream/develop