.......... [ZBX-8048] Synchronized development branch with upstream