Delivery of new features and bugfixes into master branch.

Bartek Wronarequested to merge
develop into master

Prerequisites for another tagged release, v1.25.1

Merge request reports