fix 4556: scan menu shall always be visible
Merge remote-tracking branch 'origin/release'