Issue #119: Better support for processing local changes during app termination