[v9_11] Ensure use of "echo_i" where possible

In many instances 'echo "I:' construct was used where echo_i function should have been.

(cherry picked from commit a5bce6cb)

Closes #2218 (closed)