.......... [ZBX-5077] Merge from 2.0