Aligning main production branch with develop

Klaus Illmayerrequested to merge
develop into master

Many changes since last time, tested on stage, now merging to main

Merge request reports