Merge "Do not return invalid hash from ApiStashEdit"