Merge "Fix a bug where batch scan wasn't stopped correctly." into nyc-dev