Apply read/modify/update optimization from #848