SONAR-5007 Add first POC