fix
autmerger changes
Merge pull request #848 from andrzej-jankowski/ui_fixes

Scan - show status fix
Merge pull request #849 from andrzej-jankowski/automerger_fix

Scan - changes
Merge remote-tracking branch 'allegro/v2.0.0-rc4' into develop