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