.......... [ZBX-8503] code simplifying