Adjust telemetry code currently labeled with ~incident

Problem to solve

Intended users

Proposal

Further details

This work supports the Incident Management direction.