2021-09-22

Fix issue #147, #148 (error on restore when local double otp state is inconsistent)