https://netnode.atlassian.net/jira/software/c/projects/RP/boards/321?assignee=6310d13d3e578bb3b5fec34e&selectedIssue=SOL-372