Merge pull request #524 from hakonanes/main-into-develop-after-0.13.1

Merge pull request #524 from hakonanes/main-into-develop-after-0.13.1 #1300