Merge "Support abnormal restart on setting" into devel_3.0_main