.......... [ZBXNEXT-2260] Brought development branch up to date with trunk.