Merge "Report original request ID on failed shelve"