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