..F....... [ZBX-8200] Manually merge in ZBX-8200.