Dev - merge latest from dev #158

Closed kloknibor closed 1 year ago