Put back Logic after github accident
Merge remote-tracking branch 'origin/master' into Qingtao_Add/Delete/Undo