...G...... [ZBX-8545] Reverted commits related to ZBX-8545 as the issue requires more corrections