[Backport release/v6.x] fix: prevent reporter self switching, other tiny cleanup#1001

brendaloya merged 1 commit intorelease/v6.xtellor-io/layer:release/v6.xfrom

backport-995-to-release/v6.xtellor-io/layer:backport-995-to-release/v6.xCopy head branch name to clipboard