OSDN Git Service

DO NOT MERGE: Backport N backup/restore stability work to M am: d6f3a11107 am: aac7d0442c