plug the backspace hole in console
Merge branch 'dev'