Fix shudown scheduler with intrupted version
Fix XML formetter null problem
Merge remote-tracking branch 'origin/develop' into develop