Fix #4892 - update_batch()

Regression caused by 0c23e9122666a30797079bea9415da135d4f7e12 trying to fix #4871

Supersedes #4929
6 files changed