Fixes scheduled scans tab.
Merge branch '2.1M1' into qa