.......... [ZBX-8197] merge from trunk