Merge branch 'master' into sovrum

Created by  Henrik Tjäder  on June 8, 2020
F3GMCMWTQ533LIP63WD7Z6JGUIHINCZOBMRT6EBIDWXGQY7Y7IYQC
Change contents