Rm dbg message and fix highlight when no selection
Merge branch 'refs/heads/develop' into develop2