.......... [ZBX-8436] remove development branch
.......... [ZBX-8478] merge from trunk