.......... [ZBX-8439] remove development branch
.......... [ZBX-8315] merge from trunk