Fix scanning when no change-monitor present
Merge branch 'jake'