Changes incorporated by...

Bartek Wronarequested to merge
MR_297_2_deployed into deployed_20200928_pure

Changes incorporated by !297 (merged) to develop, prepared to deployed branch.

Merge request reports