Fix #737: delivering of local activities causing unintended side effects, such as rollbacking changes