Issue #208: Updating local-change processing to work in batch