Revert "Merge branch '154-confidential-issue' into 'development'" This reverts merge request !210 See merge request !213