implements feature bodyguard
Merge branch 'Feature_echo_bodyguard'