Fix critical bug to block forever in scanning module
Merge branch 'master' into qualified-completion