remove echo comment
Merge remote-tracking branch 'origin/development' into jeh_branch