Merge commit '156411df4627336b246db78cddca8248ed615b67' * commit '156411df4627336b246db78cddca8248ed615b67': Use a long for restore token
Merge commit '156411df4627336b246db78cddca8248ed615b67' * commit '156411df4627336b246db78cddca8248ed615b67': Use a long for restore token