.......PS. [ZBX-8092] merged r46674:46734 from 2.2 branch (no conflicts)