Merge "Add compat path for restore underflow"