Changes done directly in deployed_20200928_pure branch delivered to develop.

Changes originally done in commits: 5d87238e fc824f05 c772c5c6

added 8 commits

• a18289b5...7f0fb4d6 - 7 commits from branch develop
• 2fd88873 - branch 'deployed_fixes_2_develop' rebased onto develop

Compare with previous version

merged

mentioned in commit f51c7e79