Deleted echo
Merge branch 'fix/delecho' into develop