Merge pull request #6461 from mmohtashamirad/fix_stale_scan_result_in_channel_analysis