...G...... [ZBX-8503] merged changes from dev/ZBX-8503-2.4 r49591:49597