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