partly juttas version from 04-12-20 See merge request lido/development!65
This reverts merge request !61
Merge to master See merge request lido/development!61