.......... [ZBX-7811] sync to the latest 2.0 branch