Changes done directly in deployed_20200928_pure branch delivered to develop.

Bartek Wronarequested to merge
deployed_fixes_2_develop into develop

Changes originally done in commits: 5d87238e fc824f05 c772c5c6

Merge request reports