.......... [ZBX-8816] Merged to trunk r49389 and 2.4 r49383
.......... [ZBX-8816] Created dev branch