.......... [ZBX-8837] reverted last merge