Merge pull request #660 from hakonanes/main-into-develop-post-0.9.0

Merge pull request #660 from hakonanes/main-into-develop-post-0.9.0 #292