.......... [ZBX-7875] merged to 2.0