Merge "Fix ApiStashEdit wrt custom DataUpdates."